JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added dbus variant with X support

Browse Source 
Default is the old variant (without X).

svn path=/nixpkgs/trunk/; revision=9350
This commit is contained in:
Yury G. Kudryashov 2007-09-20 19:40:22 +00:00
parent b6b6888765
commit ffeb95502d
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/dbus_x/default.nix Normal file
View File

@ -0,0 +1,13 @@
args: with args;
stdenv.mkDerivation {
name = "dbus-1.0.2";
src = fetchurl {
url = http://dbus.freedesktop.org/releases/dbus/dbus-1.0.2.tar.gz;
sha256 = "1jn652zb81mczsx4rdcwrrzj3lfhx9d107zjfnasc4l5yljl204a";
};
buildInputs = [pkgconfig expat libX11 libICE libSM];
configureFlags = "--with-x --disable-static --localstatedir=/var --with-session-socket-dir=/tmp";
patchPhase = "sed -e /mkinstalldirs.*localstatedir/d -i bus/Makefile.in";
}

14
pkgs/top-level/all-packages.nix
View File

@ -1466,8 +1466,20 @@ rec {
inherit fetchurl stdenv;
};
dbus = import ../development/libraries/dbus {
# I think, this is a bad practice to use getVersion for various build
# variants, but it's 5 o'clock now...
dbus = getVersion "dbus" dbus_alts;
dbus_alts = rec
{
noX11 = import ../development/libraries/dbus {
inherit fetchurl stdenv pkgconfig expat;
};
withX11 = import ../development/libraries/dbus_x {
inherit fetchurl stdenv pkgconfig expat;
inherit (xlibs) libX11 libICE libSM;
};
default = noX11;
};
dbus_glib = import ../development/libraries/dbus-glib {