diff options
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/drivers/samsung/1.00.36/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/jackaudio/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/screensavers/slock/default.nix | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index 564a590e0e07f..fac3dfccba620 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -112,6 +112,6 @@ in stdenv.mkDerivation rec { # Tested on linux-x86_64. Might work on linux-i386. # Probably won't work on anything else. platforms = platforms.linux; - maintainers = with maintainers; [ tohl ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 28344c3fc5a3e..922941c55e8d9 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -2,7 +2,7 @@ , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec , libiconv, ijs, lcms2, callPackage, bash, buildPackages, openjpeg , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups -, x11Support ? cupsSupport, xlibsWrapper # with CUPS, X11 only adds very little +, x11Support ? cupsSupport, xorg # with CUPS, X11 only adds very little }: let @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec libiconv ijs lcms2 bash openjpeg ] - ++ lib.optional x11Support xlibsWrapper + ++ lib.optionals x11Support [ xorg.libICE xorg.libX11 xorg.libXext xorg.libXt ] ++ lib.optional cupsSupport cups ; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 2f7ffeb89f32a..441f3ccb37f4e 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { --replace /bin/bash ${bash}/bin/bash ''; - dontAddWafCrossFlags = "true"; + dontAddWafCrossFlags = true; wafConfigureFlags = [ "--classic" "--autostart=${if (optDbus != null) then "dbus" else "classic"}" diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 9f364ba520cd2..c23b5fdc249b8 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, writeText -, xorgproto, libX11, libXext, libXrandr +, xorgproto, libX11, libXext, libXrandr, libxcrypt # default header can be obtained from # https://git.suckless.org/slock/tree/config.def.h , conf ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; - buildInputs = [ xorgproto libX11 libXext libXrandr ]; + buildInputs = [ xorgproto libX11 libXext libXrandr libxcrypt ]; installFlags = [ "PREFIX=$(out)" ]; |