mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

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

Browse source 
svn path=/nixpkgs/trunk/; revision=24347
This commit is contained in:
Sander van der Burg 2010-10-18 11:30:44 +00:00
parent 4f27541261
commit 0cc4ca1fcd
4 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/dbus-glib/default.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak";
};
buildInputs = [ pkgconfig expat gettext libiconv ];
buildInputs = [ pkgconfig expat gettext ]
++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
propagatedBuildInputs = [ dbus.libs glib ];

5
pkgs/development/libraries/glib/2.22.x.nix
View file

@ -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 @@ stdenv.mkDerivation rec {
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.

5
pkgs/development/libraries/glib/2.24.x.nix
View file

@ -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 @@ stdenv.mkDerivation rec {
sha256 = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04";
};
buildInputs = [ pkgconfig gettext perl libiconv ];
buildInputs = [ pkgconfig gettext perl ]
++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
propagatedBuildInputs = [ zlib ];

11
pkgs/top-level/all-packages.nix
View file

@ -2686,8 +2686,7 @@ let
};
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 @@ let
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 @@ let
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 { };