mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 06:45:16 +01:00
Merge pull request #176498 from ehmry/xscreensaver-perl
xscreensaver: add missing Perl libs
This commit is contained in:
commit
0ab21ed9c1
1 changed files with 4 additions and 2 deletions
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper
|
||||
, pkg-config, intltool
|
||||
, perl, gettext, libX11, libXext, libXi, libXt
|
||||
, perl, perlPackages, gettext, libX11, libXext, libXi, libXt
|
||||
, libXft, libXinerama, libXrandr, libXxf86vm, libGL, libGLU, gle
|
||||
, gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam
|
||||
, systemd, coreutils
|
||||
|
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
|||
perl gettext libX11 libXext libXi libXt
|
||||
libXft libXinerama libXrandr libXxf86vm libGL libGLU gle
|
||||
gtk2 gdk-pixbuf gdk-pixbuf-xlib libxml2 pam
|
||||
perlPackages.LWPProtocolHttps perlPackages.MozillaCA
|
||||
] ++ lib.optional withSystemd systemd;
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -44,7 +45,8 @@ stdenv.mkDerivation rec {
|
|||
for bin in $out/bin/*; do
|
||||
wrapProgram "$bin" \
|
||||
--prefix PATH : "$out/libexec/xscreensaver" \
|
||||
--prefix PATH : "${lib.makeBinPath [ coreutils ]}"
|
||||
--prefix PATH : "${lib.makeBinPath [ coreutils perl ]}" \
|
||||
--prefix PERL5LIB ':' $PERL5LIB
|
||||
done
|
||||
'' + lib.optionalString forceInstallAllHacks ''
|
||||
make -j$NIX_BUILD_CORES -C hacks/glx dnalogo
|
||||
|
|
Loading…
Reference in a new issue