Author: raskin Date: 2010-06-18 19:33:15 +0000 (Fri, 18 Jun 2010) New Revision: 22332
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22332&view=rev Modified: nixpkgs/trunk/pkgs/applications/graphics/xscreensaver/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Fixing problems with Xscreensaver caused by using stdenv builder Changes: Modified: nixpkgs/trunk/pkgs/applications/graphics/xscreensaver/default.nix =================================================================== --- nixpkgs/trunk/pkgs/applications/graphics/xscreensaver/default.nix 2010-06-18 19:31:02 UTC (rev 22331) +++ nixpkgs/trunk/pkgs/applications/graphics/xscreensaver/default.nix 2010-06-18 19:33:15 UTC (rev 22332) @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk -, libxml2, libglade }: +...@{ pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk +, libxml2, libglade, builderDefsPackage, ... }: -stdenv.mkDerivation rec { +builderDefsPackage +(a: rec { version = "5.11"; name = "xscreensaver-${version}"; url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";; - src = fetchurl { + src = a.fetchurl { inherit url; sha256="0w47s0qd8ab6ywhhhkqjx0grb2b28bh2flnkdpj3yaind202l0s7"; }; - buildInputs = + buildInputs = with a; [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade xlibs.xlibs xlibs.libXmu ]; @@ -20,19 +21,21 @@ [ "--with-gl" "--with-dpms" "--with-pixbuf" - "--with-x-app-defaults=\$out/share/xscreensaver/app-defaults" - "--with-hackdir=\$out/share/xscreensaver-hacks" + "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults" + "--with-hackdir=\${out}/share/xscreensaver-hacks" ]; - preConfigure = + preConfigure = a.fullDepEntry '' sed -e 's...@gtk_datadir@%...@datadir@% ; s...@po_datadir@%...@datadir@%' \ -i driver/Makefile.in po/Makefile.in.in - ''; + '' ["minInit" "doUnpack"]; + phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; + meta = { description = "A set of screensavers"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.allBut "i686-cygwin"; + maintainers = [ a.lib.maintainers.raskin ]; + platforms = a.lib.platforms.allBut "i686-cygwin"; }; -} +}) x Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-18 19:31:02 UTC (rev 22331) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-18 19:33:15 UTC (rev 22332) @@ -8983,8 +8983,9 @@ pyrex = pyrex095; }; - xscreensaver = makeOverridable (import ../applications/graphics/xscreensaver) { - inherit stdenv fetchurl pkgconfig bc perl xlibs libjpeg mesa libxml2; + xscreensaver = (import ../applications/graphics/xscreensaver) { + inherit pkgconfig bc perl xlibs libjpeg mesa libxml2 + builderDefsPackage; inherit (gtkLibs) gtk; inherit (gnome) libglade; }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
