diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-14 17:58:20 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-22 16:50:14 -0500 |
| commit | 9109a904794ab2be09d10727f45cf9f043a6cf00 (patch) | |
| tree | bc12fb8c3af9738888daf4ab73eb6079ed0f91e2 /pkgs/development/libraries | |
| parent | c295e7a7f53e336c3654618b836404ba2bfb733b (diff) | |
| download | nixpkgs-9109a904794ab2be09d10727f45cf9f043a6cf00.tar nixpkgs-9109a904794ab2be09d10727f45cf9f043a6cf00.tar.gz nixpkgs-9109a904794ab2be09d10727f45cf9f043a6cf00.tar.bz2 nixpkgs-9109a904794ab2be09d10727f45cf9f043a6cf00.tar.lz nixpkgs-9109a904794ab2be09d10727f45cf9f043a6cf00.tar.xz nixpkgs-9109a904794ab2be09d10727f45cf9f043a6cf00.tar.zst nixpkgs-9109a904794ab2be09d10727f45cf9f043a6cf00.zip | |
treewide: remove some more gettext references
Diffstat (limited to 'pkgs/development/libraries')
| -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 |
4 files changed, 4 insertions, 7 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 = '' |