diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2015-03-21 12:35:51 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2015-03-26 12:58:39 +0000 |
| commit | 3e15f6a3700968904c4a30c5a90c46d766856bbf (patch) | |
| tree | 20453731d9e2142dcede1619489bacd7aac1fc63 /pkgs/misc/screensavers | |
| parent | 6258728318fe55faef64285e614fe97edc7b9111 (diff) | |
| download | nixlib-3e15f6a3700968904c4a30c5a90c46d766856bbf.tar nixlib-3e15f6a3700968904c4a30c5a90c46d766856bbf.tar.gz nixlib-3e15f6a3700968904c4a30c5a90c46d766856bbf.tar.bz2 nixlib-3e15f6a3700968904c4a30c5a90c46d766856bbf.tar.lz nixlib-3e15f6a3700968904c4a30c5a90c46d766856bbf.tar.xz nixlib-3e15f6a3700968904c4a30c5a90c46d766856bbf.tar.zst nixlib-3e15f6a3700968904c4a30c5a90c46d766856bbf.zip | |
xscreensaver: change patchPhase into preConfigure so that one can use patches, fix a comment
Diffstat (limited to 'pkgs/misc/screensavers')
| -rw-r--r-- | pkgs/misc/screensavers/xscreensaver/default.nix | 7 |
1 files 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 = |