public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put systemd unit dirs on the right place

Browse Source 
Also see #1936.
This commit is contained in:
Vladimír Čunát 2014-03-13 21:44:51 +01:00
parent 344f2e6518
commit d6349df0dd
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/nut/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
"--without-powerman" # Until we have it ... "--without-powerman" # Until we have it ...
"--without-cgi" "--without-cgi"
"--without-hal" "--without-hal"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udev-dir=$(out)/etc/udev" "--with-udev-dir=$(out)/etc/udev"
]; ];

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

@ -56,7 +56,7 @@ let
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--with-session-socket-dir=/tmp" "--with-session-socket-dir=/tmp"
"--with-systemdsystemunitdir=$(out)/lib/systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/os-specific/linux/udisks/2-default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udevdir=$(out)/lib/udev" "--with-udevdir=$(out)/lib/udev"
]; ];

6
pkgs/tools/misc/colord/default.nix
View File

@ -12,7 +12,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; 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 buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
bashCompletion ]; bashCompletion ];

2
pkgs/tools/misc/system-config-printer/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
[ "--with-udev-rules" [ "--with-udev-rules"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
]; ];
postInstall = postInstall =

7
pkgs/tools/security/pcsclite/default.nix
View File

@ -12,13 +12,10 @@ stdenv.mkDerivation rec {
# The OS should care on preparing the drivers into this location # The OS should care on preparing the drivers into this location
configureFlags = [ configureFlags = [
"--enable-usbdropdir=/var/lib/pcsc/drivers" "--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 ]; buildInputs = [ udev dbus_libs perl ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];