mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 05:00:16 +00:00
Added dbus variant with X support
Default is the old variant (without X). svn path=/nixpkgs/trunk/; revision=9350
This commit is contained in:
parent
b6b6888765
commit
ffeb95502d
13
pkgs/development/libraries/dbus_x/default.nix
Normal file
13
pkgs/development/libraries/dbus_x/default.nix
Normal 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";
|
||||
}
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue