From e822cc9c44e07e7defb273bf5f0550b111921f81 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 15 Aug 2013 13:53:43 +1000 Subject: [PATCH] p7zip: fix build on darwin --- pkgs/tools/archivers/p7zip/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 767e85d67733..ff51b28f34bb 100644 --- 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;