diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2017-09-08 22:20:30 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2017-09-08 22:22:04 +0200 |
commit | 76437e5e5ac2300fcb79a344511ed7a15d908cd0 (patch) | |
tree | c1dac9104c3d239aaed2b0167daf4beccb72a62c /pkgs | |
parent | 8bad0a7f231c9208506571ca133938b4e6d0c44e (diff) |
gsc: fix darwin build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/compression/bsc/default.nix | 9 | ||||
-rw-r--r-- | 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 be512e2ae689..4c88e58e6c10 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 e1e243aabfbb..f2c2986ff0c8 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 { }; |