aboutsummaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/dwmblocks/pkg.nix4
-rw-r--r--packages/sidekick-dashboard/pkg.nix11
-rw-r--r--packages/st/pkg.nix4
-rw-r--r--packages/xmonad/pkg.nix8
4 files changed, 17 insertions, 10 deletions
diff --git a/packages/dwmblocks/pkg.nix b/packages/dwmblocks/pkg.nix
index 41cfdf2..b140b88 100644
--- a/packages/dwmblocks/pkg.nix
+++ b/packages/dwmblocks/pkg.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, libX11, pkgconfig }:
+{ stdenv, pkgs, libX11, pkg-config }:
with pkgs.lib;
stdenv.mkDerivation rec {
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = ./source;
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 ];
diff --git a/packages/sidekick-dashboard/pkg.nix b/packages/sidekick-dashboard/pkg.nix
index b38aa4c..0835db6 100644
--- a/packages/sidekick-dashboard/pkg.nix
+++ b/packages/sidekick-dashboard/pkg.nix
@@ -2,6 +2,10 @@
with pkgs.lib;
let
+ useFakeHash = false;
+ commitHash = "f160ec9742cacd14f8853ea6d17dc4011f85156d";
+ realSha256 = "sha256-LCFcX23dY7tFoXPgEHaD+U6g2X/9M4aE4TPfvhu6bLI=";
+
src = fetchFromGitHub {
owner = "mozilla";
repo = "nixpkgs-mozilla";
@@ -20,8 +24,11 @@ rustPlatform.buildRustPackage rec {
src = pkgs.fetchFromGitHub {
owner = "phenax";
repo = "sidekick-dashboard";
- rev = "994450070a984448cb0b286fc729a92c6487c0c9";
- sha256 = "sha256-M4mbep/qxRsRxZdILxKY5ejRPVZ3Pm6nuToDCZky/A0=";
+ rev = commitHash;
+ sha256 =
+ if useFakeHash
+ then lib.fakeSha256
+ else realSha256;
};
cargoSha256 = "sha256-dgW2SlpKovw79wkdGcbVm6c8KqkbcZlvZCwCcdVBShw=";
diff --git a/packages/st/pkg.nix b/packages/st/pkg.nix
index 4604a99..cd95fa7 100644
--- a/packages/st/pkg.nix
+++ b/packages/st/pkg.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, libX11, libXinerama, libXft, fontconfig, pkgconfig, ncurses }:
+{ stdenv, pkgs, libX11, libXinerama, libXft, fontconfig, pkg-config, ncurses }:
with pkgs.lib;
stdenv.mkDerivation rec {
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = ./source;
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXft fontconfig ncurses ];
diff --git a/packages/xmonad/pkg.nix b/packages/xmonad/pkg.nix
index cf4aa04..65f964d 100644
--- a/packages/xmonad/pkg.nix
+++ b/packages/xmonad/pkg.nix
@@ -5,7 +5,7 @@
, haskellPackages
}:
let
- xmobar_custom = haskellPackages.xmobar.overrideAttrs (
+ xmobar-custom = haskellPackages.xmobar.overrideAttrs (
_: {
configureFlags = [
"-fwith_xft"
@@ -39,11 +39,11 @@ haskellPackages.mkDerivation rec {
xmonad
xmonad-contrib
- xmobar_custom
+ xmobar-custom
];
librarySystemDepends = with pkgs; [
- pkgs.pkgconfig
+ pkgs.pkg-config
xorg.libXext
xorg.libXScrnSaver
xorg.libXinerama
@@ -52,7 +52,7 @@ haskellPackages.mkDerivation rec {
xorg.libXrandr
xorg.libXft
xorg.libXpm
- alsaLib
+ alsa-lib
wirelesstools
];
}