Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5887affc26db
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 23d47ac2e676
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 1, 2017

  1. dbus: don't search for units in current-system

    @abbradar
    abbradar committed Feb 1, 2017
    Copy the full SHA
    4877a56 View commit details

Commits on Feb 6, 2017

  1. Merge pull request #22354 from abbradar/dbus-etc 

    dbus: don't search for units in current-system
    @abbradar
    abbradar authored Feb 6, 2017
    Copy the full SHA
    23d47ac View commit details
Showing with 3 additions and 4 deletions.
  1. +3 −4 pkgs/development/libraries/dbus/default.nix
7 changes: 3 additions & 4 deletions pkgs/development/libraries/dbus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,9 @@ let
version = "1.10.14";
sha256 = "10x0wvv2ly4lyyfd42k4xw0ar5qdbi9cksw3l5fcwf1y6mq8y8r3";

self = stdenv.mkDerivation {
self = stdenv.mkDerivation {
name = "dbus-${version}";
inherit version;

src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
@@ -49,8 +50,6 @@ self = stdenv.mkDerivation {
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-systemduserunitdir=$(out)/etc/systemd/user"
"--enable-user-session"
# this package installs nothing into those dirs and they create a dependency
"--datadir=/run/current-system/sw/share"
"--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper
] ++ lib.optional (!x11Support) "--without-x";

@@ -64,7 +63,7 @@ self = stdenv.mkDerivation {

doCheck = true;

installFlags = "sysconfdir=$(out)/etc datadir=$(out)/share";
installFlags = [ "sysconfdir=$(out)/etc" ];

# it's executed from $lib by absolute path
postFixup = ''