Author: viric
Date: Fri Sep 17 18:57:38 2010
New Revision: 23839
URL: https://svn.nixos.org/websvn/nix/?rev=23839&sc=1

Log:
Fixing the mtdutils package (install to proper LSB like directories, and remove 
'v' in front
of the version, which annoyed nix-env name matching)

Modified:
   nixpkgs/trunk/pkgs/tools/filesystems/mtdutils/default.nix

Modified: nixpkgs/trunk/pkgs/tools/filesystems/mtdutils/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/filesystems/mtdutils/default.nix   Fri Sep 17 
17:34:08 2010        (r23838)
+++ nixpkgs/trunk/pkgs/tools/filesystems/mtdutils/default.nix   Fri Sep 17 
18:57:38 2010        (r23839)
@@ -1,19 +1,19 @@
 {stdenv, fetchgit, libuuid, lzo, zlib, acl}:
 
 let
-  version = "v1.3.1";
+  version = "1.3.1";
 in
 stdenv.mkDerivation {
   name = "mtd-utils-${version}";
 
   src = fetchgit {
     url = git://git.infradead.org/mtd-utils.git;
-    rev = version;
+    rev = "v" + version;
     sha256 = "0pjjs9x03bgvphqwlw99c2cpkpjsx0vkqi79vjl7fcb9pyrghgd1";
   };
 
-  preBuild = ''
-    makeFlags="DESTDIR=$out"
+  patchPhase = ''
+    sed -i -e s,/usr/local,, -e s,/usr,$out, common.mk
   '';
 
   buildInputs = [ libuuid lzo zlib acl ];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to