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

Fixing problems with Xscreensaver caused by using stdenv builder

Browse Source 
svn path=/nixpkgs/trunk/; revision=22332
This commit is contained in:
Michael Raskin 2010-06-18 19:33:15 +00:00
parent 7a1dde5d25
commit c1059d8969
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/graphics/xscreensaver/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, fetchurl, pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk x@{ pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk
, libxml2, libglade }: , libxml2, libglade, builderDefsPackage, ... }:
stdenv.mkDerivation rec { builderDefsPackage
(a: rec {
version = "5.11"; version = "5.11";
name = "xscreensaver-${version}"; name = "xscreensaver-${version}";
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
src = fetchurl { src = a.fetchurl {
inherit url; inherit url;
sha256="0w47s0qd8ab6ywhhhkqjx0grb2b28bh2flnkdpj3yaind202l0s7"; sha256="0w47s0qd8ab6ywhhhkqjx0grb2b28bh2flnkdpj3yaind202l0s7";
}; };
buildInputs = buildInputs = with a;
[ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade
xlibs.xlibs xlibs.libXmu xlibs.xlibs xlibs.libXmu
]; ];
@ -20,19 +21,21 @@ stdenv.mkDerivation rec {
[ "--with-gl" [ "--with-gl"
"--with-dpms" "--with-dpms"
"--with-pixbuf" "--with-pixbuf"
"--with-x-app-defaults=\$out/share/xscreensaver/app-defaults" "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
"--with-hackdir=\$out/share/xscreensaver-hacks" "--with-hackdir=\${out}/share/xscreensaver-hacks"
]; ];
preConfigure = preConfigure = a.fullDepEntry
'' ''
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
''; '' ["minInit" "doUnpack"];
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
meta = { meta = {
description = "A set of screensavers"; description = "A set of screensavers";
maintainers = [ stdenv.lib.maintainers.raskin ]; maintainers = [ a.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.allBut "i686-cygwin"; platforms = a.lib.platforms.allBut "i686-cygwin";
}; };
} }) x

5
pkgs/top-level/all-packages.nix
View File

@ -8983,8 +8983,9 @@ let
pyrex = pyrex095; pyrex = pyrex095;
}; };
xscreensaver = makeOverridable (import ../applications/graphics/xscreensaver) { xscreensaver = (import ../applications/graphics/xscreensaver) {
inherit stdenv fetchurl pkgconfig bc perl xlibs libjpeg mesa libxml2; inherit pkgconfig bc perl xlibs libjpeg mesa libxml2
builderDefsPackage;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) libglade; inherit (gnome) libglade;
}; };