From 3e15f6a3700968904c4a30c5a90c46d766856bbf Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 12:35:51 +0000 Subject: [PATCH] xscreensaver: change patchPhase into preConfigure so that one can use patches, fix a comment --- pkgs/misc/screensavers/xscreensaver/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index cb937a940006..1d039e0a4402 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -18,14 +18,15 @@ stdenv.mkDerivation rec { libXxf86misc intltool ]; - patchPhase = + 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 path to GTK. + + # Fix installation paths for GTK resources. 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 ''; configureFlags =