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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2019-09-04 11:00:56 +02:00
parent 2c5835b09a 1d8a3973f4
commit 4aad2947f8
217 changed files with 7332 additions and 2071 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/upower/default.nix
+3 -3
View File
@@ -43,9 +43,9 @@ stdenv.mkDerivation {
"--localstatedir=/var"
]
++ stdenv.lib.optional useSystemd [
"--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
"--with-systemdutildir=${placeholder ''out''}/lib/systemd"
"--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d"
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--with-systemdutildir=${placeholder "out"}/lib/systemd"
"--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
]
;