diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-14 14:15:06 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-22 16:50:11 -0500 |
commit | ed2a9cf65fe2bf02bc3e7070ca4b124260d99585 (patch) | |
tree | eabfdcf2e6203d6da7f1ada80a785455533c9c80 /pkgs/desktops/gnome-2 | |
parent | 9e75fb5eb4f26de4e551137c3caaa78b9bf8b050 (diff) | |
download | nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.gz nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.bz2 nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.lz nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.xz nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.zst nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.zip |
treewide: remove libintl hacks
Diffstat (limited to 'pkgs/desktops/gnome-2')
-rw-r--r-- | pkgs/desktops/gnome-2/platform/ORBit2/default.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/platform/libglade/default.nix | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index b8a41a529b05..ef18f0783ce3 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintl }: stdenv.mkDerivation rec { name = "ORBit2-${minVer}.19"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig libintl ]; + propagatedBuildInputs = [ glib libIDL ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 5003215529e4..956fec1ddf15 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -14,6 +14,4 @@ stdenv.mkDerivation { buildInputs = [ gtk python gettext ]; propagatedBuildInputs = [ libxml2 ]; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; } |