1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00

xscreensaver: wrap binaries to add libexec and coreutils to path

Closes https://github.com/NixOS/nixpkgs/issues/141183
This commit is contained in:
Artturin 2021-10-15 18:18:23 +03:00
parent 4f292fe210
commit 5ae1a21e0c

View file

@ -1,9 +1,9 @@
{ lib, stdenv, fetchurl
{ lib, stdenv, fetchurl, makeWrapper
, pkg-config, intltool
, perl, gettext, libX11, libXext, libXi, libXt
, libXft, libXinerama, libXrandr, libXxf86vm, libGL, libGLU, gle
, gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam
, systemd
, systemd, coreutils
, forceInstallAllHacks ? false
, withSystemd ? stdenv.isLinux
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
pkg-config intltool
pkg-config intltool makeWrapper
];
buildInputs = [
@ -37,7 +37,13 @@ stdenv.mkDerivation rec {
"--with-app-defaults=${placeholder "out"}/share/xscreensaver/app-defaults"
];
postInstall = lib.optionalString forceInstallAllHacks ''
postInstall = ''
for bin in $out/bin/*; do
wrapProgram "$bin" \
--prefix PATH : "$out/libexec/xscreensaver" \
--prefix PATH : "${lib.makeBinPath [ coreutils ]}"
done
'' + lib.optionalString forceInstallAllHacks ''
make -j$NIX_BUILD_CORES -C hacks/glx dnalogo
cat hacks/Makefile.in \
| grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks