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

treewide: remove lintl references

Browse Source 
libintl should be used directly, not through NIX_LDFLAGS.
This commit is contained in:
Matthew Bauer 2018-05-15 23:59:53 -05:00
parent 8419c347ca
commit c605d171bb
5 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
View File

@ -38,6 +38,4 @@ stdenv.mkDerivation rec {
preConfigure = optionalString stdenv.isDarwin '' preConfigure = optionalString stdenv.isDarwin ''
intltoolize --force intltoolize --force
''; '';
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
} }

9
pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3, libintlOrEmpty }: { stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3
, libintl }:
let let
pname = "libgnome-games-support"; pname = "libgnome-games-support";
@ -11,10 +12,8 @@ in stdenv.mkDerivation rec {
sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1"; sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1";
}; };
nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ glib gtk3 libgee ]; buildInputs = [ glib gtk3 libgee libintl ];
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {

6
pkgs/desktops/lxde/core/lxtask/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3 }: { stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxtask-${version}"; name = "lxtask-${version}";
@ -11,12 +11,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ gtk3 ]; buildInputs = [ gtk3 libintl ];
configureFlags = [ "--enable-gtk3" ]; configureFlags = [ "--enable-gtk3" ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
meta = { meta = {
description = "Lightweight and desktop independent task manager"; description = "Lightweight and desktop independent task manager";
longDescription = '' longDescription = ''

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

@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
glib glib
]; ];
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
doCheck = true; doCheck = true;
passthru = { passthru = {

6
pkgs/development/libraries/gtksourceview/3.x.nix
View File

@ -21,10 +21,10 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection vala_0_40 ] nativeBuildInputs = [ pkgconfig intltool perl gobjectIntrospection vala_0_40 ]
++ stdenv.lib.optionals doCheck checkInputs; ++ stdenv.lib.optionals doCheck checkInputs;
buildInputs = [ atk cairo glib pango libxml2 ]; buildInputs = [ atk cairo glib pango libxml2 gettext ];
preBuild = '' preBuild = ''
substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
@ -32,8 +32,6 @@ in stdenv.mkDerivation rec {
patches = [ ./3.x-nix_share_path.patch ]; patches = [ ./3.x-nix_share_path.patch ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = stdenv.isLinux; doCheck = stdenv.isLinux;