Author: simons
Date: Fri Nov  5 14:35:14 2010
New Revision: 24601
URL: https://svn.nixos.org/websvn/nix/?rev=24601&sc=1

Log:
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}.

Modified:
   nixpkgs/trunk/pkgs/tools/misc/screen/default.nix

Modified: nixpkgs/trunk/pkgs/tools/misc/screen/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/misc/screen/default.nix    Fri Nov  5 11:45:16 
2010        (r24600)
+++ nixpkgs/trunk/pkgs/tools/misc/screen/default.nix    Fri Nov  5 14:35:14 
2010        (r24601)
@@ -8,7 +8,11 @@
     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 @@
     license = stdenv.lib.licenses.gpl2Plus;
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons 
];
   };
 }
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to