Merge pull request #833 from lovek323/p7zip

p7zip: fix build on darwin
2013-08-14 21:22:08 -07:00
parent 1af650355b e822cc9c44
commit 857cfb4c03
1 changed files with 6 additions and 5 deletions
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
    sha256 = "10j7rc1nzdp7vvcpc3340yi3qw7abby4szv8zkwh10d0zizpwma9";
  };

-  preConfigure =
-    ''
-      makeFlagsArray=(DEST_HOME=$out)
-      buildFlags=all3
-    '';
+  preConfigure = ''
+    makeFlagsArray=(DEST_HOME=$out)
+    buildFlags=all3
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    cp makefile.macosx_64bits makefile.machine
+  '';

  enableParallelBuilding = true;