From c1059d89699987bf5a219e33e4353f851c4a0fb0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 18 Jun 2010 19:33:15 +0000 Subject: [PATCH] Fixing problems with Xscreensaver caused by using stdenv builder svn path=/nixpkgs/trunk/; revision=22332 --- .../graphics/xscreensaver/default.nix | 27 ++++++++++--------- pkgs/top-level/all-packages.nix | 5 ++-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix index 726cb801b60..7c9af7f2545 100644 --- a/pkgs/applications/graphics/xscreensaver/default.nix +++ b/pkgs/applications/graphics/xscreensaver/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk -, libxml2, libglade }: +x@{ 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 @@ stdenv.mkDerivation rec { [ "--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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b54952b9e1..9b9d2c82fa6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8983,8 +8983,9 @@ let 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; };