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

Merging from trunk. I resolved some conflicts; I hope that well.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
This commit is contained in:
Lluís Batlle i Rossell
2010-10-23 14:52:21 +00:00
parent 4309788df0 327a2eae30
commit 6dc839d344
221 changed files with 3452 additions and 1129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/glib/2.22.x.nix
+3 -2
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.
pkgs/development/libraries/glib/2.24.x.nix
+3 -2
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 libiconv ];
buildInputs = [ pkgconfig gettext ]
++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
buildNativeInputs = [ perl ];
propagatedBuildInputs = [ zlib ];