diff options
| author | Danny Wilson <danny@prime.vc> | 2013-02-26 12:03:23 +0000 |
|---|---|---|
| committer | Danny Wilson <danny@onlinetouch.nl> | 2013-02-28 20:04:03 +0100 |
| commit | 8ae2a89cabb83428d5217ac8623b70935317c1b1 (patch) | |
| tree | 55da79310952c478930f1777f1907c6a80025cf8 /pkgs/development/libraries/glib/2.34.x.nix | |
| parent | c041dbb1d2ca5d52dd837564a4b73d48c52175a7 (diff) | |
| download | nixpkgs-8ae2a89cabb83428d5217ac8623b70935317c1b1.tar nixpkgs-8ae2a89cabb83428d5217ac8623b70935317c1b1.tar.gz nixpkgs-8ae2a89cabb83428d5217ac8623b70935317c1b1.tar.bz2 nixpkgs-8ae2a89cabb83428d5217ac8623b70935317c1b1.tar.lz nixpkgs-8ae2a89cabb83428d5217ac8623b70935317c1b1.tar.xz nixpkgs-8ae2a89cabb83428d5217ac8623b70935317c1b1.tar.zst nixpkgs-8ae2a89cabb83428d5217ac8623b70935317c1b1.zip | |
Update glib and dbus - and make them compile on Illumos.
Diffstat (limited to 'pkgs/development/libraries/glib/2.34.x.nix')
| -rw-r--r-- | pkgs/development/libraries/glib/2.34.x.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glib/2.34.x.nix b/pkgs/development/libraries/glib/2.34.x.nix index 69ed44aecca..e11e3bcb317 100644 --- a/pkgs/development/libraries/glib/2.34.x.nix +++ b/pkgs/development/libraries/glib/2.34.x.nix @@ -12,11 +12,11 @@ # $out/bin/gtester-report' to postInstall if this is solved stdenv.mkDerivation (rec { - name = "glib-2.34.0"; + name = "glib-2.34.3"; src = fetchurl { url = "mirror://gnome/sources/glib/2.34/${name}.tar.xz"; - sha256 = "f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144"; + sha256 = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7"; }; # configure script looks for d-bus but it is only needed for tests @@ -26,7 +26,11 @@ stdenv.mkDerivation (rec { propagatedBuildInputs = [ pcre zlib libffi ]; - configureFlags = "--with-pcre=system --disable-fam"; + configureFlags = "--with-pcre=system --disable-fam" + + (stdenv.lib.optionalString (libiconvOrNull != null) " --with-libiconv=gnu") + + (stdenv.lib.optionalString stdenv.isSunOS " --disable-modular-tests"); + + CPPFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-DBSD_COMP"; enableParallelBuilding = true; |