From 642ee7a77fbbeb486bb1f924344550d34e830338 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 22 Nov 2015 14:12:52 -0600 Subject: [PATCH] pbzip2: g++ -> c++ to fix on darwin (close #11212) vcunat made it apply unconditionally, as it works OK on Linux at least. /cc maintainer @viric. --- pkgs/tools/compression/pbzip2/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index ff03b9b30c5..7873df19e48 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, bzip2}: +{ stdenv, fetchurl, bzip2 }: let major = "1.1"; version = "${major}.9"; @@ -12,15 +12,16 @@ stdenv.mkDerivation rec { }; buildInputs = [ bzip2 ]; - installPhase = '' - make install PREFIX=$out - ''; + + preBuild = "substituteInPlace Makefile --replace g++ c++"; + + installFlags = "PREFIX=$out"; meta = with stdenv.lib; { homepage = http://compression.ca/pbzip2/; description = "A parallel implementation of bzip2 for multi-core machines"; license = licenses.bsd2; maintainers = with maintainers; [viric]; - platforms = platforms.linux; + platforms = platforms.unix; }; }