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

* Fixed xscreensaver (it couldn't find the X headers/libraries

Browse Source 
anymore).

svn path=/nixpkgs/branches/stdenv-updates/; revision=19694
This commit is contained in:
Eelco Dolstra 2010-01-26 21:40:32 +00:00
parent 6b4de5c25e
commit 7eff18fa03
2 changed files with 36 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,41 +1,36 @@
args : with args; let localDefs = builderDefs.passthru.function (args // rec { { stdenv, fetchurl, pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk
version = lib.attrByPath ["version"] "5.10" args; , libxml2, libglade }:
src = /* put a fetchurl here */
fetchurl {
url = "http://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz";
sha256 = "07zy157wqwgcapqycyv89yabxa8byk4p8jn3zlvhf7lx5w1xmval";
};
useConfig = true;
reqsList = [
["true" "libX11" "pkgconfig" "bc" "perl" "intltool" "libXmu"]
["GL" "mesa"]
["GUI" "gtk" "libxml2" "libglade"]
["jpeg" "libjpeg"]
["false"]
];
configFlags = [
"GL" " --with-gl "
"gdkpixbuf" " --with-pixbuf "
"DPMS" " --with-dpms "
"true" (" --with-x-app-defaults=\$out/share/xscreensaver/app-defaults "+
" --with-hackdir=\$out/share/xscreensaver-hacks ")
];
});
in with localDefs;
let
preConfigure = fullDepEntry ("
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' "+
"-i driver/Makefile.in po/Makefile.in.in;
") ["minInit" "doUnpack"];
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xscreensaver-5.10"; name = "xscreensaver-5.10";
buildCommand = textClosure localDefs
[preConfigure doConfigure doMakeInstall doForceShare doPropagate]; src = fetchurl {
meta = { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
description = "A set of screensavers"; sha256 = "07zy157wqwgcapqycyv89yabxa8byk4p8jn3zlvhf7lx5w1xmval";
inherit src; };
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.allBut "i686-cygwin"; buildInputs =
}; [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade
xlibs.xlibs xlibs.libXmu
];
configureFlags =
[ "--with-gl"
"--with-dpms"
"--with-pixbuf"
"--with-x-app-defaults=\$out/share/xscreensaver/app-defaults"
"--with-hackdir=\$out/share/xscreensaver-hacks"
];
preConfigure =
''
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
-i driver/Makefile.in po/Makefile.in.in
'';
meta = {
description = "A set of screensavers";
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
};
} }

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

@ -8189,14 +8189,8 @@ let
pyrex = pyrex095; pyrex = pyrex095;
}; };
xscreensaverBase = composedArgsAndFun (import ../applications/graphics/xscreensaver) { xscreensaver = makeOverridable (import ../applications/graphics/xscreensaver) {
inherit stdenv fetchurl builderDefs lib pkgconfig bc perl intltool; inherit stdenv fetchurl pkgconfig bc perl xlibs libjpeg mesa libxml2;
inherit (xlibs) libX11 libXmu;
};
xscreensaver = xscreensaverBase.passthru.function {
flags = ["GL" "gdkpixbuf" "DPMS" "gui" "jpeg"];
inherit mesa libxml2 libjpeg;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) libglade; inherit (gnome) libglade;
}; };