diff options
| -rw-r--r-- | maintainers/docs/coding-conventions.txt | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
3 files changed, 18 insertions, 6 deletions
diff --git a/maintainers/docs/coding-conventions.txt b/maintainers/docs/coding-conventions.txt index c95dc3c3600..2cff1c33d7e 100644 --- a/maintainers/docs/coding-conventions.txt +++ b/maintainers/docs/coding-conventions.txt @@ -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. diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index b60705f21f6..9fdf55029b6 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -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; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08f918ca621..f8ecb3e96c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |