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

Merge pull request #94566 from 7c6f434c/xscreensaver-demo-fix

Browse Source 
xscreensaver: fix xscreensaver-demo build
This commit is contained in:
Michael Raskin 2020-08-02 23:15:27 +00:00 committed by GitHub
commit ba9f2498ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/misc/screensavers/xscreensaver/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 { stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11
, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2
, libxml2, libglade, intltool, xorg, makeWrapper, gle , libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib
, forceInstallAllHacks ? false , forceInstallAllHacks ? false
}: }:
@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam [ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam
libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
libXxf86misc intltool xorg.appres makeWrapper gle libXxf86misc intltool xorg.appres makeWrapper gle gdk-pixbuf
gdk-pixbuf-xlib
]; ];
preConfigure = preConfigure =