Author: sandervanderburg
Date: Mon Oct 18 11:30:44 2010
New Revision: 24347
URL: https://svn.nixos.org/websvn/nix/?rev=24347&sc=1
Log:
Changed my dirty libiconv hacks I once made for i686-freebsd, into a more
consistent manner by checking for a non-Linux platform in the build
expressions. Hopefully, this increases portability for non-Linux platforms
Modified:
nixpkgs/trunk/pkgs/development/libraries/dbus-glib/default.nix
nixpkgs/trunk/pkgs/development/libraries/glib/2.22.x.nix
nixpkgs/trunk/pkgs/development/libraries/glib/2.24.x.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/dbus-glib/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/dbus-glib/default.nix Mon Oct
18 11:05:36 2010 (r24346)
+++ nixpkgs/trunk/pkgs/development/libraries/dbus-glib/default.nix Mon Oct
18 11:30:44 2010 (r24347)
@@ -8,7 +8,8 @@
sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak";
};
- buildInputs = [ pkgconfig expat gettext libiconv ];
+ buildInputs = [ pkgconfig expat gettext ]
+ ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
propagatedBuildInputs = [ dbus.libs glib ];
Modified: nixpkgs/trunk/pkgs/development/libraries/glib/2.22.x.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glib/2.22.x.nix Mon Oct 18
11:05:36 2010 (r24346)
+++ nixpkgs/trunk/pkgs/development/libraries/glib/2.22.x.nix Mon Oct 18
11:30:44 2010 (r24347)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv ? null}:
+{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv}:
stdenv.mkDerivation rec {
name = "glib-2.22.5";
@@ -8,7 +8,8 @@
sha256 =
"802be9c9ffeb631725ffd6ed35af0af309776729a7fab4fcb48f2b0b8fe7245b";
};
- buildInputs = [pkgconfig gettext perl libiconv];
+ buildInputs = [pkgconfig gettext perl]
+ ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
# The nbd package depends on a static version of this library; hence
# the default configure flag --disable-static is switched off.
Modified: nixpkgs/trunk/pkgs/development/libraries/glib/2.24.x.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glib/2.24.x.nix Mon Oct 18
11:05:36 2010 (r24346)
+++ nixpkgs/trunk/pkgs/development/libraries/glib/2.24.x.nix Mon Oct 18
11:30:44 2010 (r24347)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv ? null, zlib }:
+{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }:
stdenv.mkDerivation rec {
name = "glib-2.24.1";
@@ -8,7 +8,8 @@
sha256 =
"014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04";
};
- buildInputs = [ pkgconfig gettext perl libiconv ];
+ buildInputs = [ pkgconfig gettext perl ]
+ ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
propagatedBuildInputs = [ zlib ];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Oct 18 11:05:36
2010 (r24346)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Oct 18 11:30:44
2010 (r24347)
@@ -2686,8 +2686,7 @@
};
dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) {
- inherit fetchurl stdenv pkgconfig gettext dbus expat glib;
- libiconv = if (stdenv.system == "i686-freebsd") then libiconv else null;
+ inherit fetchurl stdenv pkgconfig gettext dbus expat glib libiconv;
};
dbus_java = callPackage ../development/libraries/java/dbus-java { };
@@ -3010,9 +3009,7 @@
gtkLibs218 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs218;
in rec {
- glib = callPackage ../development/libraries/glib/2.22.x.nix {
- libiconv = if stdenv.system == "i686-freebsd" then libiconv else null;
- };
+ glib = callPackage ../development/libraries/glib/2.22.x.nix { };
glibmm = callPackage ../development/libraries/glibmm/2.22.x.nix { };
@@ -3030,9 +3027,7 @@
gtkLibs220 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs220;
in rec {
- glib = callPackage ../development/libraries/glib/2.24.x.nix {
- libiconv = if stdenv.system == "i686-freebsd" then libiconv else null;
- };
+ glib = callPackage ../development/libraries/glib/2.24.x.nix { };
glibmm = callPackage ../development/libraries/glibmm/2.22.x.nix { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
