diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-30 18:50:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-30 18:50:22 +0100 |
| commit | 4caab41c1b4b57d9d971a1c1e5c4da35648615d4 (patch) | |
| tree | e6814d5064422ca2abd8e4d3014ebe85ed04968a /pkgs/os-specific | |
| parent | 11dab7bd4aa0eaf0f0cead46427a67f5deaf3221 (diff) | |
| parent | 3ddead70852a5d484b063fec52973c56bad22601 (diff) | |
| download | nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.gz nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.bz2 nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.lz nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.xz nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.zst nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.zip | |
Merge pull request #37693 from jtojnar/min-nix-two
treewide: Re-add reverted Nix 2 syntax features
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/dbus-broker/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/selinux-sandbox/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 794ebd126fa4..6582825d6f24 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ dbus glib linuxHeaders systemd ]; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system"; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; postInstall = '' install -Dm644 ../README $out/share/doc/dbus-broker/README diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 431f5e9ef517..71d2ee6e80af 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-m 4755" "-m 755" substituteInPlace sandboxX.sh \ --replace "#!/bin/sh" "#!${bash}/bin/sh" \ - --replace "/usr/share/sandbox/start" "$out/share/sandbox/start" \ + --replace "/usr/share/sandbox/start" "${placeholder "out"}/share/sandbox/start" \ --replace "/usr/bin/cut" "${coreutils}/bin/cut" \ --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \ --replace "secon" "${policycoreutils}/bin/secon" |