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

Revert "treewide: remove placeholder usage"

Browse Source 
This reverts commit 025881c23649b1c99930081ec9dc6b9fcd04afb4.
This commit is contained in:
Jan Tojnar 2018-04-26 22:59:45 +02:00
parent 69a17c7a19
commit 6cefc9c1b0
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View File

@ -40,9 +40,6 @@ stdenv.mkDerivation rec {
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
]; ];
postPatch = ''
cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags"
'';
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {

2
pkgs/development/libraries/pipewire/default.nix
View File

@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
"-Denable_gstreamer=true" "-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 FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file

2
pkgs/os-specific/linux/selinux-sandbox/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "-m 4755" "-m 755" substituteInPlace Makefile --replace "-m 4755" "-m 755"
substituteInPlace sandboxX.sh \ substituteInPlace sandboxX.sh \
--replace "#!/bin/sh" "#!${bash}/bin/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/cut" "${coreutils}/bin/cut" \
--replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \ --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \
--replace "secon" "${policycoreutils}/bin/secon" --replace "secon" "${policycoreutils}/bin/secon"