From c13e0307b607eebc52e1f22d58f258bb3790346f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Nov 2010 14:35:14 +0000 Subject: [PATCH] pkgs/tools/misc/screen: fixed various impurities Removed lots of hard-coded /usr/something paths from the configure script. Moved $out/{info,man} to $out/share/{info,man}. svn path=/nixpkgs/trunk/; revision=24601 --- pkgs/tools/misc/screen/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index ee3a79b7aa02..329754ab5f5f 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0xvckv1ia5pjxk7fs4za6gz2njwmfd54sc464n8ab13096qxbw3q"; }; - configureFlags = [ "--enable-telnet" ]; + preConfigure = '' + configureFlags="--enable-telnet --infodir=$out/share/info --mandir=$out/share/man" + sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in + ''; + buildInputs = [ ncurses ]; doCheck = true; @@ -42,6 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; }; }