diff options
| -rw-r--r-- | pkgs/applications/misc/nut/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/udisks/2-default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/colord/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/pcsclite/default.nix | 7 |
6 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 92cd0de8b312..3e972f672cc2 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--without-powerman" # Until we have it ... "--without-cgi" "--without-hal" - "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-udev-dir=$(out)/etc/udev" ]; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 2101f99bbb90..11ad2014663a 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -56,7 +56,7 @@ let "--localstatedir=/var" "--sysconfdir=/etc" "--with-session-socket-dir=/tmp" - "--with-systemdsystemunitdir=$(out)/lib/systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 90272d8f0959..6c9b743fe177 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" - "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-udevdir=$(out)/lib/udev" ]; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 525c3ba9f2c4..a744adbe05c1 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = "--with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d --disable-bash-completion"; + configureFlags = [ + "--with-udevrulesdir=$out/lib/udev/rules.d" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--disable-bash-completion" + ]; buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection bashCompletion ]; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index b0da497c322e..51cb1d22a49e 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-udev-rules" - "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; postInstall = diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 18fa10451536..3cf8c8157dbc 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -12,13 +12,10 @@ stdenv.mkDerivation rec { # The OS should care on preparing the drivers into this location configureFlags = [ "--enable-usbdropdir=/var/lib/pcsc/drivers" - "--with-systemdsystemunitdir=$out/lib/systemd/system" # probably + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--enable-confdir=$(out)/etc" ]; - preConfigure = '' - configureFlags="$configureFlags --enable-confdir=$out/etc" - ''; - buildInputs = [ udev dbus_libs perl ]; nativeBuildInputs = [ pkgconfig ]; |