diff options
-rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gts/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libassuan/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/libksba/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/r-modules/generic-builder.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/policycoreutils/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/filesystems/e2fsprogs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/graphviz/base.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/networking/lftp/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 4 |
10 files changed, 12 insertions, 16 deletions
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 8769584a9f2..984603827c8 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -40,9 +40,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound ] - ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv - ++ lib.optional stdenv.isDarwin gettext + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound gettext libiconv ] ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile ++ buildInputs; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 59b3a34f7bd..770f743fd26 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; + buildInputs = [ glib gettext ]; meta = { homepage = http://gts.sourceforge.net/; diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 827d3de79ea..91ceb959779 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # libassuan-config - buildInputs = [ libgpgerror pth ] - ++ stdenv.lib.optional stdenv.isDarwin gettext; + buildInputs = [ libgpgerror pth gettext]; doCheck = true; diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 3f7a4bed9cc..0611e0e57e7 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; + buildInputs = [ gettext ]; propagatedBuildInputs = [ libgpgerror ]; postInstall = '' diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index ff6c3ad1b90..0d731de33f8 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -3,9 +3,9 @@ { name, buildInputs ? [], ... } @ attrs: stdenv.mkDerivation ({ - buildInputs = buildInputs ++ [R] ++ + buildInputs = buildInputs ++ [R gettext] ++ stdenv.lib.optionals attrs.requireX [utillinux xvfb_run] ++ - stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gettext gfortran]; + stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index 536c69ff557..980b77f8df2 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -65,4 +65,3 @@ stdenv.mkDerivation rec { inherit (libsepol.meta) homepage platforms maintainers; }; } - diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 95a57cefc0e..a97e024c0aa 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig texinfo ]; - buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext; + buildInputs = [ libuuid gettext ]; configureFlags = if stdenv.isLinux then [ diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index f61c7923d79..b360f9a3450 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango + gettext ] ++ optionals (xorg != null) (with xorg; [ libXrender libXaw libXpm ]) - ++ optionals (stdenv.isDarwin) [ ApplicationServices gettext ]; + ++ optionals (stdenv.isDarwin) [ ApplicationServices ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 3e4f1eaeeef..36eced80856 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring ] - ++ stdenv.lib.optional stdenv.isDarwin gettext; + buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring gettext ]; hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e4e53b90a65..50f0d0a57cc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3877,7 +3877,7 @@ let self = _self // overrides; _self = with self; { \$(BASEEXT)\$(OBJ_EXT): \$(BASEEXT).xsi \$(BASEEXT).xsi: \$(DBI_DRIVER_XST) $autodir/Driver_xst.h - \$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi + \$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsif # --- '; @@ -8071,7 +8071,7 @@ let self = _self // overrides; _self = with self; { LocaleGettext = buildPerlPackage { name = "LocaleGettext-1.05"; - buildInputs = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext; + buildInputs = [ pkgs.gettext ]; src = fetchurl { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; |