tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

put systemd unit dirs on the right place

Also see #1936.

Vladimír Čunát d6349df0 344f2e65

+11 -10
unified split
+1 -1
pkgs/applications/misc/nut/default.nix
··· 20 20 "--without-powerman" # Until we have it ... 21 21 "--without-cgi" 22 22 "--without-hal" 23 - "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" 23 + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" 24 24 "--with-udev-dir=$(out)/etc/udev" 25 25 ]; 26 26
+1 -1
pkgs/development/libraries/dbus/default.nix
··· 56 56 "--localstatedir=/var" 57 57 "--sysconfdir=/etc" 58 58 "--with-session-socket-dir=/tmp" 59 - "--with-systemdsystemunitdir=$(out)/lib/systemd" 59 + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" 60 60 ]; 61 61 62 62 enableParallelBuilding = true;
+1 -1
pkgs/os-specific/linux/udisks/2-default.nix
··· 30 30 31 31 configureFlags = [ 32 32 "--localstatedir=/var" 33 - "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" 33 + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" 34 34 "--with-udevdir=$(out)/lib/udev" 35 35 ]; 36 36
+5 -1
pkgs/tools/misc/colord/default.nix
··· 12 12 13 13 enableParallelBuilding = true; 14 14 15 - configureFlags = "--with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d --disable-bash-completion"; 15 + configureFlags = [ 16 + "--with-udevrulesdir=$out/lib/udev/rules.d" 17 + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" 18 + "--disable-bash-completion" 19 + ]; 16 20 17 21 buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection 18 22 bashCompletion ];
+1 -1
pkgs/tools/misc/system-config-printer/default.nix
··· 27 27 28 28 configureFlags = 29 29 [ "--with-udev-rules" 30 - "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" 30 + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" 31 31 ]; 32 32 33 33 postInstall =
+2 -5
pkgs/tools/security/pcsclite/default.nix
··· 12 12 # The OS should care on preparing the drivers into this location 13 13 configureFlags = [ 14 14 "--enable-usbdropdir=/var/lib/pcsc/drivers" 15 - "--with-systemdsystemunitdir=$out/lib/systemd/system" # probably 15 + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" 16 + "--enable-confdir=$(out)/etc" 16 17 ]; 17 - 18 - preConfigure = '' 19 - configureFlags="$configureFlags --enable-confdir=$out/etc" 20 - ''; 21 18 22 19 buildInputs = [ udev dbus_libs perl ]; 23 20