public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gsc: fix darwin build

Browse Source
This commit is contained in:
Daiderd Jordan 2017-09-08 22:20:30 +02:00
parent 8bad0a7f23
commit 76437e5e5a
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/compression/bsc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl } : { stdenv, fetchurl, openmp ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bsc-${version}"; name = "bsc-${version}";
@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = stdenv.lib.optional stdenv.isDarwin openmp;
prePatch = ''
substituteInPlace makefile \
--replace 'g++' '$(CXX)'
'';
preInstall = '' preInstall = ''
makeFlagsArray+=("PREFIX=$out") makeFlagsArray+=("PREFIX=$out")
''; '';

4
pkgs/top-level/all-packages.nix
View File

@ -1296,7 +1296,9 @@ with pkgs;
atool = callPackage ../tools/archivers/atool { }; atool = callPackage ../tools/archivers/atool { };
bsc = callPackage ../tools/compression/bsc { }; bsc = callPackage ../tools/compression/bsc {
inherit (llvmPackages) openmp;
};
bzip2 = callPackage ../tools/compression/bzip2 { }; bzip2 = callPackage ../tools/compression/bzip2 { };