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

xscreensaver: use gle

Browse Source
This commit is contained in:
Michael Raskin 2016-06-10 14:51:19 +02:00
parent a6072331c0
commit 46d3001fa7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11
, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk
, libxml2, libglade, intltool, xorg, makeWrapper , libxml2, libglade, intltool, xorg, makeWrapper, gle
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,15 +15,11 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
libXxf86misc intltool xorg.appres makeWrapper libXxf86misc intltool xorg.appres makeWrapper gle
]; ];
preConfigure = preConfigure =
'' ''
# Fix build error in version 5.18. Remove this patch when updating
# to a later version.
#sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
# Fix installation paths for GTK resources. # Fix installation paths for GTK resources.
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
-i driver/Makefile.in po/Makefile.in.in -i driver/Makefile.in po/Makefile.in.in
@ -33,7 +29,7 @@ stdenv.mkDerivation rec {
[ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts" [ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
"--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext" "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
"--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext" "--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
"--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay" "--with-xshm-ext" "--with-xdbe-ext"
"--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults" "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
]; ];