diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-04-26 22:59:45 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-30 18:18:30 +0200 |
| commit | 6cefc9c1b0fbe64c00094762ca535850b5186ec1 (patch) | |
| tree | ee17c93c34fa9985f7739a4a23676537c5f9211c /pkgs | |
| parent | 69a17c7a19481a734640218b2fd25a6689d15d58 (diff) | |
| download | nixpkgs-6cefc9c1b0fbe64c00094762ca535850b5186ec1.tar nixpkgs-6cefc9c1b0fbe64c00094762ca535850b5186ec1.tar.gz nixpkgs-6cefc9c1b0fbe64c00094762ca535850b5186ec1.tar.bz2 nixpkgs-6cefc9c1b0fbe64c00094762ca535850b5186ec1.tar.lz nixpkgs-6cefc9c1b0fbe64c00094762ca535850b5186ec1.tar.xz nixpkgs-6cefc9c1b0fbe64c00094762ca535850b5186ec1.tar.zst nixpkgs-6cefc9c1b0fbe64c00094762ca535850b5186ec1.zip | |
Revert "treewide: remove placeholder usage"
This reverts commit 025881c23649b1c99930081ec9dc6b9fcd04afb4.
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, 2 insertions, 5 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 5d6f6b667e9..c355c9bbce6 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -40,9 +40,6 @@ stdenv.mkDerivation rec { "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" ]; - postPatch = '' - cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags" - ''; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index c50fc9fb35c..e87ed8e48a9 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 = "lib/systemd/user"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/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 431f5e9ef51..71d2ee6e80a 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" |