Author: urkud
Date: Fri Aug 26 14:57:48 2011
New Revision: 28836
URL: https://svn.nixos.org/websvn/nix/?rev=28836&sc=1
Log:
Add newer dbus and dbus-glib
Old versions are kept to prevent huge rebuild
Added:
nixpkgs/trunk/pkgs/development/libraries/dbus-glib/0.94.nix
- copied, changed from r28833,
nixpkgs/trunk/pkgs/development/libraries/dbus-glib/default.nix
nixpkgs/trunk/pkgs/development/libraries/dbus/1.5.6.nix
- copied, changed from r28833,
nixpkgs/trunk/pkgs/development/libraries/dbus/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/dbus-glib/default.nix
nixpkgs/trunk/pkgs/development/libraries/dbus/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/upower/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/dbus-glib/0.94.nix (from r28833,
nixpkgs/trunk/pkgs/development/libraries/dbus-glib/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/dbus-glib/default.nix Fri Aug
26 13:49:23 2011 (r28833, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/dbus-glib/0.94.nix Fri Aug 26
14:57:48 2011 (r28836)
@@ -1,18 +1,18 @@
{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
stdenv.mkDerivation rec {
- name = "dbus-glib-0.86";
-
+ name = "dbus-glib-0.94";
+
src = fetchurl {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
- sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak";
+ sha256 = "16yk106bp58in6vz2li2s3iwk1si65f0n22m8c2mplzh2j9zlq74";
};
-
+
buildInputs = [ pkgconfig expat gettext ]
++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
-
- propagatedBuildInputs = [ dbus.libs glib ];
-
+
+ propagatedBuildInputs = [ dbus glib ];
+
passthru = { inherit dbus glib; };
meta = {
Modified: nixpkgs/trunk/pkgs/development/libraries/dbus-glib/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/dbus-glib/default.nix Fri Aug
26 14:22:09 2011 (r28835)
+++ nixpkgs/trunk/pkgs/development/libraries/dbus-glib/default.nix Fri Aug
26 14:57:48 2011 (r28836)
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "dbus-glib-0.86";
-
+
src = fetchurl {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak";
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/dbus/1.5.6.nix
(from r28833, nixpkgs/trunk/pkgs/development/libraries/dbus/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/dbus/default.nix Fri Aug 26
13:49:23 2011 (r28833, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/dbus/1.5.6.nix Fri Aug 26
14:57:48 2011 (r28836)
@@ -1,26 +1,26 @@
{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
let
- version = "1.4.14";
-
+ version = "1.5.6";
+
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";;
- sha256 = "0xsqkq2q2hb09dcdsw0y359zvml480h79qvl9g31r7da57y7xwj7";
+ sha256 = "18g5328wnh25p0hihv5gg55q5l019zzwr04shvp67myvwy07m851";
};
patches = [ ./ignore-missing-includedirs.patch ];
-
+
configureFlags = "--localstatedir=/var --sysconfdir=/etc
--with-session-socket-dir=/tmp";
-
+
in rec {
libs = stdenv.mkDerivation {
name = "dbus-library-" + version;
-
+
buildInputs = [ pkgconfig expat ];
-
+
inherit src patches configureFlags;
-
+
preConfigure =
''
sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
@@ -41,10 +41,10 @@
inherit src patches;
configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin";
-
+
buildInputs = [ pkgconfig expat libs ]
++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ];
-
+
NIX_LDFLAGS = "-ldbus-1";
preConfigure =
Modified: nixpkgs/trunk/pkgs/development/libraries/dbus/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/dbus/default.nix Fri Aug 26
14:22:09 2011 (r28835)
+++ nixpkgs/trunk/pkgs/development/libraries/dbus/default.nix Fri Aug 26
14:57:48 2011 (r28836)
@@ -2,25 +2,25 @@
let
version = "1.4.14";
-
+
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";;
sha256 = "0xsqkq2q2hb09dcdsw0y359zvml480h79qvl9g31r7da57y7xwj7";
};
patches = [ ./ignore-missing-includedirs.patch ];
-
+
configureFlags = "--localstatedir=/var --sysconfdir=/etc
--with-session-socket-dir=/tmp";
-
+
in rec {
libs = stdenv.mkDerivation {
name = "dbus-library-" + version;
-
+
buildInputs = [ pkgconfig expat ];
-
+
inherit src patches configureFlags;
-
+
preConfigure =
''
sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
@@ -41,10 +41,10 @@
inherit src patches;
configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin";
-
+
buildInputs = [ pkgconfig expat libs ]
++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ];
-
+
NIX_LDFLAGS = "-ldbus-1";
preConfigure =
Modified: nixpkgs/trunk/pkgs/os-specific/linux/upower/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/upower/default.nix Fri Aug 26
14:22:09 2011 (r28835)
+++ nixpkgs/trunk/pkgs/os-specific/linux/upower/default.nix Fri Aug 26
14:57:48 2011 (r28836)
@@ -11,10 +11,9 @@
sha256 = "1c2b2f74vxx1y7vkwbrx5z4j5pdgvsw00l6cldvy7a4k7hrbprq6";
};
- buildInputs =
- [ xz pkgconfig glib dbus dbus_glib polkit intltool
- libxslt docbook_xsl udev libusb1
- ];
+ buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ];
+
+ buildNativeInputs = [ xz pkgconfig ];
configureFlags = "--with-backend=linux --localstatedir=/var";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 26 14:22:09
2011 (r28835)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 26 14:57:48
2011 (r28836)
@@ -3144,10 +3144,16 @@
useX11 = true;
};
- dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) {
- inherit fetchurl stdenv pkgconfig gettext dbus expat glib libiconv;
+ dbus_all_1_5_6 = callPackage ../development/libraries/dbus/1.5.6.nix {
+ useX11 = true;
+ };
+
+ dbus_glib_0_94 = callPackage ../development/libraries/dbus-glib/0.94.nix {
+ dbus = pkgs.dbus_all_1_5_6.libs;
};
+ dbus_glib = callPackage ../development/libraries/dbus-glib { };
+
dbus_java = callPackage ../development/libraries/java/dbus-java { };
dclib = callPackage ../development/libraries/dclib { };
@@ -5858,7 +5864,9 @@
untie = callPackage ../os-specific/linux/untie {};
- upower = callPackage ../os-specific/linux/upower { };
+ upower = callPackage ../os-specific/linux/upower {
+ dbus_glib = pkgs.dbus_glib_0_94;
+ };
upstart = callPackage ../os-specific/linux/upstart { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
