diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-28 19:44:30 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-28 19:44:33 +0200 |
| commit | 025881c23649b1c99930081ec9dc6b9fcd04afb4 (patch) | |
| tree | b4721360ebe6a3870503c63e821c6a183e437acf /pkgs | |
| parent | d5f356374cf85a2be9abad797be5e9f06cff7388 (diff) | |
| download | nixlib-025881c23649b1c99930081ec9dc6b9fcd04afb4.tar nixlib-025881c23649b1c99930081ec9dc6b9fcd04afb4.tar.gz nixlib-025881c23649b1c99930081ec9dc6b9fcd04afb4.tar.bz2 nixlib-025881c23649b1c99930081ec9dc6b9fcd04afb4.tar.lz nixlib-025881c23649b1c99930081ec9dc6b9fcd04afb4.tar.xz nixlib-025881c23649b1c99930081ec9dc6b9fcd04afb4.tar.zst nixlib-025881c23649b1c99930081ec9dc6b9fcd04afb4.zip | |
treewide: remove placeholder usage
Temporary compatibility fix, continuation of https://github.com/NixOS/nixpkgs/pull/37860
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/pipewire/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/selinux-sandbox/default.nix | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 8abb51b56e72..7a01d73ebf46 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + postPatch = '' + cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags" + ''; preFixup = '' for f in $(find $out/libexec/ -type f -executable); do diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 2c677ad74745..7e7314c936dd 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { "-Denable_gstreamer=true" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 71d2ee6e80af..431f5e9ef517 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" "${placeholder "out"}/share/sandbox/start" \ + --replace "/usr/share/sandbox/start" "$out/share/sandbox/start" \ --replace "/usr/bin/cut" "${coreutils}/bin/cut" \ --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \ --replace "secon" "${policycoreutils}/bin/secon" |