diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-12-15 23:45:52 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-12-15 23:45:52 +0000 |
commit | 6211cf4c0ced646ac384521835b701f42efb01fa (patch) | |
tree | 8167861d6c662384826e92f541bcea3e7f87d136 /pkgs/development/libraries/dbus | |
parent | 6a83330e8b349116a12dca87caf524842a475b0f (diff) | |
download | nixlib-6211cf4c0ced646ac384521835b701f42efb01fa.tar nixlib-6211cf4c0ced646ac384521835b701f42efb01fa.tar.gz nixlib-6211cf4c0ced646ac384521835b701f42efb01fa.tar.bz2 nixlib-6211cf4c0ced646ac384521835b701f42efb01fa.tar.lz nixlib-6211cf4c0ced646ac384521835b701f42efb01fa.tar.xz nixlib-6211cf4c0ced646ac384521835b701f42efb01fa.tar.zst nixlib-6211cf4c0ced646ac384521835b701f42efb01fa.zip |
* dbus-tools: purity fix (don't try to create /var).
svn path=/nixpkgs/trunk/; revision=13638
Diffstat (limited to 'pkgs/development/libraries/dbus')
-rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 8d386be72de7..154958af6b9a 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,16 +1,24 @@ -args: with args; +{stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true}: + let version = "1.2.4"; + src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; sha256 = "1f7v79ws34mh6j75fk6w4w9v441vffll0fwf5vk94mwa0bc28g5b"; }; + configureFlags = "--disable-static --localstatedir=/var --with-session-socket-dir=/tmp"; + in rec { + libs = stdenv.mkDerivation { name = "dbus-library-" + version; + buildInputs = [pkgconfig expat]; + inherit src configureFlags; + patchPhase = '' sed -i /mkinstalldirs.*localstatedir/d bus/Makefile.in sed -i '/SUBDIRS/s/ tools//' Makefile.in @@ -19,21 +27,25 @@ in rec { tools = stdenv.mkDerivation { name = "dbus-tools-" + version; + inherit src configureFlags; + buildInputs = [pkgconfig expat libs] - ++ (if useX11 then [libX11 libICE libSM] else []); + ++ stdenv.lib.optionals useX11 [libX11 libICE libSM]; + postConfigure = "cd tools"; NIX_LDFLAGS = "-ldbus-1"; + makeFlags = "DBUS_DAEMONDIR=${daemon}/bin"; patchPhase = '' sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in - sed -i '/mkdir.*localstate/d' tools/Makefile.in + substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:' ''; }; -# I'm too lazy to separate daemon and libs now. + # I'm too lazy to separate daemon and libs now. daemon = libs; # FIXME TODO |