From 76437e5e5ac2300fcb79a344511ed7a15d908cd0 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 8 Sep 2017 22:20:30 +0200 Subject: [PATCH] gsc: fix darwin build --- pkgs/tools/compression/bsc/default.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index be512e2ae68..4c88e58e6c1 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl } : +{ stdenv, fetchurl, openmp ? null }: stdenv.mkDerivation rec { name = "bsc-${version}"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + buildInputs = stdenv.lib.optional stdenv.isDarwin openmp; + + prePatch = '' + substituteInPlace makefile \ + --replace 'g++' '$(CXX)' + ''; + preInstall = '' makeFlagsArray+=("PREFIX=$out") ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1e243aabfb..f2c2986ff0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1296,7 +1296,9 @@ with pkgs; atool = callPackage ../tools/archivers/atool { }; - bsc = callPackage ../tools/compression/bsc { }; + bsc = callPackage ../tools/compression/bsc { + inherit (llvmPackages) openmp; + }; bzip2 = callPackage ../tools/compression/bzip2 { };