summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-07-18 22:00:40 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-07-18 22:00:40 +0000
commitd514ac437a1e8bb66cbd3c1b832e2607a2f4b8dc (patch)
treeb02f80a9593ea038844504f2760dbdf5b00cea1e
parent26521d42e2f6e6ebf50b5792fd1ee8a6352faa25 (diff)
downloadnixpkgs-d514ac437a1e8bb66cbd3c1b832e2607a2f4b8dc.tar
nixpkgs-d514ac437a1e8bb66cbd3c1b832e2607a2f4b8dc.tar.gz
nixpkgs-d514ac437a1e8bb66cbd3c1b832e2607a2f4b8dc.tar.bz2
nixpkgs-d514ac437a1e8bb66cbd3c1b832e2607a2f4b8dc.tar.lz
nixpkgs-d514ac437a1e8bb66cbd3c1b832e2607a2f4b8dc.tar.xz
nixpkgs-d514ac437a1e8bb66cbd3c1b832e2607a2f4b8dc.tar.zst
nixpkgs-d514ac437a1e8bb66cbd3c1b832e2607a2f4b8dc.zip
* Dbus updated to 1.2.24.
svn path=/nixpkgs/branches/x-updates/; revision=22646
-rw-r--r--pkgs/development/libraries/dbus/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index b9d93184076..24c6f409a10 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true}:
+{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
 
 let
-  version = "1.2.16";
+  version = "1.2.24";
   
   src = fetchurl {
     url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
-    sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln";
+    sha256 = "0j2wb79kndq4b1qqr59n1g6s0lm7yp6r9ny3skimadkh9a7p8b7i";
   };
   
   configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
@@ -15,7 +15,7 @@ in rec {
   libs = stdenv.mkDerivation {
     name = "dbus-library-" + version;
     
-    buildInputs = [pkgconfig expat];
+    buildInputs = [ pkgconfig expat ];
     
     inherit src configureFlags;
     
@@ -35,8 +35,8 @@ in rec {
 
     configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin";
     
-    buildInputs = [pkgconfig expat libs]
-      ++ stdenv.lib.optionals useX11 [libX11 libICE libSM];
+    buildInputs = [ pkgconfig expat libs ]
+      ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ];
       
     postConfigure = "cd tools";