diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
commit | 4aad2947f8d680f18e5b01e115cf8cff22186998 (patch) | |
tree | a7a3d020efc6ec7be822bc06e08eca3ac311c9e2 /pkgs/os-specific/linux/upower | |
parent | 2c5835b09a1d4966756212902d36b1b8ab242da6 (diff) | |
parent | 1d8a3973f46a2d1360f855eaa0f3a19859771793 (diff) | |
download | nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.gz nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.bz2 nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.lz nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.xz nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.zst nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/upower')
-rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 1836748d5fc..59e39f72f51 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -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" ] ; |