dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

treewide: remove some more gettext references

Browse Source
This commit is contained in:
Matthew Bauer 2018-03-14 17:58:20 -05:00
parent c295e7a7f5
commit 9109a90479
10 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gnutls/generic.nix
View File

@ -40,9 +40,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound ] buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound gettext libiconv ]
++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
++ lib.optional stdenv.isDarwin gettext
++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
++ lib.optional guileBindings guile ++ lib.optional guileBindings guile
++ buildInputs; ++ buildInputs;

2
pkgs/development/libraries/gts/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; buildInputs = [ glib gettext ];
meta = { meta = {
homepage = http://gts.sourceforge.net/; homepage = http://gts.sourceforge.net/;

3
pkgs/development/libraries/libassuan/default.nix
View File

@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "info" ]; outputs = [ "out" "dev" "info" ];
outputBin = "dev"; # libassuan-config outputBin = "dev"; # libassuan-config
buildInputs = [ libgpgerror pth ] buildInputs = [ libgpgerror pth gettext];
++ stdenv.lib.optional stdenv.isDarwin gettext;
doCheck = true; doCheck = true;

2
pkgs/development/libraries/libksba/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "info" ]; outputs = [ "out" "dev" "info" ];
buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; buildInputs = [ gettext ];
propagatedBuildInputs = [ libgpgerror ]; propagatedBuildInputs = [ libgpgerror ];
postInstall = '' postInstall = ''

4
pkgs/development/r-modules/generic-builder.nix
View File

@ -3,9 +3,9 @@
{ name, buildInputs ? [], ... } @ attrs: { name, buildInputs ? [], ... } @ attrs:
stdenv.mkDerivation ({ stdenv.mkDerivation ({
buildInputs = buildInputs ++ [R] ++ buildInputs = buildInputs ++ [R gettext] ++
stdenv.lib.optionals attrs.requireX [utillinux xvfb_run] ++ 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 = NIX_CFLAGS_COMPILE =
stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

1
pkgs/os-specific/linux/policycoreutils/default.nix
View File

@ -65,4 +65,3 @@ stdenv.mkDerivation rec {
inherit (libsepol.meta) homepage platforms maintainers; inherit (libsepol.meta) homepage platforms maintainers;
}; };
} }

2
pkgs/tools/filesystems/e2fsprogs/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkgconfig texinfo ]; nativeBuildInputs = [ pkgconfig texinfo ];
buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext; buildInputs = [ libuuid gettext ];
configureFlags = configureFlags =
if stdenv.isLinux then [ if stdenv.isLinux then [

3
pkgs/tools/graphics/graphviz/base.nix
View File

@ -23,8 +23,9 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
gettext
] ++ optionals (xorg != null) (with xorg; [ libXrender libXaw libXpm ]) ] ++ optionals (xorg != null) (with xorg; [ libXrender libXaw libXpm ])
++ optionals (stdenv.isDarwin) [ ApplicationServices gettext ]; ++ optionals (stdenv.isDarwin) [ ApplicationServices ];
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];

3
pkgs/tools/networking/lftp/default.nix
View File

@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring ] buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring gettext ];
++ stdenv.lib.optional stdenv.isDarwin gettext;
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";

4
pkgs/top-level/perl-packages.nix
View File

@ -3877,7 +3877,7 @@ let self = _self // overrides; _self = with self; {
\$(BASEEXT)\$(OBJ_EXT): \$(BASEEXT).xsi \$(BASEEXT)\$(OBJ_EXT): \$(BASEEXT).xsi
\$(BASEEXT).xsi: \$(DBI_DRIVER_XST) $autodir/Driver_xst.h \$(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 { LocaleGettext = buildPerlPackage {
name = "LocaleGettext-1.05"; name = "LocaleGettext-1.05";
buildInputs = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext; buildInputs = [ pkgs.gettext ];
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz;
sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7";