mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 04:12:44 +03:00
* DBus 1.1.20.
svn path=/nixpkgs/trunk/; revision=10945
This commit is contained in:
parent
0a8f71fb9c
commit
167aa686ee
@ -1,5 +1,9 @@
|
||||
Some conventions:
|
||||
|
||||
* Directories / file names: lowercase, and use dashes between words,
|
||||
no camel case. I.e., all-packages.nix, not all allPackages.nix or
|
||||
AllPackages.nix.
|
||||
|
||||
* Don't use TABs. Everybody has different TAB settings so it's asking
|
||||
for trouble.
|
||||
|
||||
|
@ -1,12 +1,18 @@
|
||||
args: with args;
|
||||
|
||||
let
|
||||
version = "1.0.2";
|
||||
|
||||
version = "1.1.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
|
||||
sha256 = "1jn652zb81mczsx4rdcwrrzj3lfhx9d107zjfnasc4l5yljl204a";
|
||||
sha256 = "0zhl6cxlwfm9hsl7vm8ycif39805zsa1z8f0qnbfh54jmwccl7vg";
|
||||
};
|
||||
|
||||
configureFlags = "--disable-static --localstatedir=/var --with-session-socket-dir=/tmp";
|
||||
|
||||
in rec {
|
||||
|
||||
libs = stdenv.mkDerivation {
|
||||
name = "dbus-library-" + version;
|
||||
buildInputs = [pkgconfig expat];
|
||||
@ -33,10 +39,11 @@ in rec {
|
||||
'';
|
||||
};
|
||||
|
||||
# I'm too lazy to separate daemon and libs now.
|
||||
# I'm too lazy to separate daemon and libs now.
|
||||
daemon = libs;
|
||||
|
||||
# FIXME TODO
|
||||
# After merger it will be better to correct upstart-job instead.
|
||||
outPath = daemon.outPath;
|
||||
|
||||
}
|
||||
|
@ -2239,9 +2239,10 @@ rec {
|
||||
|
||||
dbus = import ../development/libraries/dbus {
|
||||
inherit fetchurl stdenv pkgconfig expat;
|
||||
inherit (xlibs) libX11 libICE libSM;
|
||||
useX11 = getConfig [ "dbus" "tools" "useX11" ]
|
||||
(getConfig [ "services" "xserver" "enable" ] false);
|
||||
inherit (xlibs) libX11 libICE libSM;
|
||||
useX11 = true; # !!! `false' doesn't build
|
||||
#useX11 = getConfig ["dbus" "tools" "useX11"]
|
||||
# (getConfig ["services" "xserver" "enable"] false);
|
||||
};
|
||||
|
||||
dbus_glib = import ../development/libraries/dbus-glib {
|
||||
|
Loading…
Reference in New Issue
Block a user