ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Update glib and dbus - and make them compile on Illumos.

Browse Source
This commit is contained in:
Danny Wilson 2013-02-26 12:03:23 +00:00 committed by Danny Wilson
parent c041dbb1d2
commit 8ae2a89cab
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/dbus/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: { stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
let let
version = "1.6.4"; version = "1.6.8";
src = fetchurl { src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
sha256 = "1wacqyfkcpayg7f8rvx9awqg275n5pksxq5q7y21lxjx85x6pfjz"; sha256 = "fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac";
}; };
patches = [ ./ignore-missing-includedirs.patch ]; patches = [ ./ignore-missing-includedirs.patch ];

10
pkgs/development/libraries/glib/2.34.x.nix
View File

@ -12,11 +12,11 @@
# $out/bin/gtester-report' to postInstall if this is solved # $out/bin/gtester-report' to postInstall if this is solved
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "glib-2.34.0"; name = "glib-2.34.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/2.34/${name}.tar.xz"; 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 # configure script looks for d-bus but it is only needed for tests
@ -26,7 +26,11 @@ stdenv.mkDerivation (rec {
propagatedBuildInputs = [ pcre zlib libffi ]; 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; enableParallelBuilding = true;