ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

* DBus 1.1.20.

Browse Source 
svn path=/nixpkgs/trunk/; revision=10945
This commit is contained in:
Eelco Dolstra 2008-03-04 13:30:34 +00:00
parent 0a8f71fb9c
commit 167aa686ee
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maintainers/docs/coding-conventions.txt
View File

@ -1,5 +1,9 @@
Some conventions: 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 * Don't use TABs. Everybody has different TAB settings so it's asking
for trouble. for trouble.

13
pkgs/development/libraries/dbus/default.nix
View File

@ -1,12 +1,18 @@
args: with args; args: with args;
let let
version = "1.0.2";
version = "1.1.20";
src = fetchurl { src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; 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"; configureFlags = "--disable-static --localstatedir=/var --with-session-socket-dir=/tmp";
in rec { in rec {
libs = stdenv.mkDerivation { libs = stdenv.mkDerivation {
name = "dbus-library-" + version; name = "dbus-library-" + version;
buildInputs = [pkgconfig expat]; 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; daemon = libs;
# FIXME TODO # FIXME TODO
# After merger it will be better to correct upstart-job instead. # After merger it will be better to correct upstart-job instead.
outPath = daemon.outPath; outPath = daemon.outPath;
} }

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

@ -2239,9 +2239,10 @@ rec {
dbus = import ../development/libraries/dbus { dbus = import ../development/libraries/dbus {
inherit fetchurl stdenv pkgconfig expat; inherit fetchurl stdenv pkgconfig expat;
inherit (xlibs) libX11 libICE libSM; inherit (xlibs) libX11 libICE libSM;
useX11 = getConfig [ "dbus" "tools" "useX11" ] useX11 = true; # !!! `false' doesn't build
(getConfig [ "services" "xserver" "enable" ] false); #useX11 = getConfig ["dbus" "tools" "useX11"]
# (getConfig ["services" "xserver" "enable"] false);
}; };
dbus_glib = import ../development/libraries/dbus-glib { dbus_glib = import ../development/libraries/dbus-glib {