Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 49c59d7d0f75
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9388fc9a56bb
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 14, 2019

  1. xscreensaver: Enable perl modules needed for RSS image fetch (#57629) 

    (cherry picked from commit 4730466)
    @booxter @7c6f434c
    booxter authored and 7c6f434c committed Mar 14, 2019
    Copy the full SHA
    9388fc9 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/misc/screensavers/xscreensaver/default.nix
7 changes: 6 additions & 1 deletion pkgs/misc/screensavers/xscreensaver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11
{ stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11
, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU_combined, gtk2
, libxml2, libglade, intltool, xorg, makeWrapper, gle
, forceInstallAllHacks ? false
@@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/xscreensaver-text \
--prefix PATH : ${stdenv.lib.makeBinPath [xorg.appres]}
wrapProgram $out/bin/xscreensaver-getimage-file \
--set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [
EncodeLocale HTTPDate HTTPMessage IOSocketSSL LWP LWPProtocolHttps
MozillaCA NetHTTP NetSSLeay TryTiny URI
]}"
''
+ stdenv.lib.optionalString forceInstallAllHacks ''
make -C hacks/glx dnalogo