tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
gsc: fix darwin build
Daiderd Jordan
8 years ago
76437e5e
8bad0a7f
+11
-2
2 changed files
expand all
collapse all
unified
split
pkgs
tools
compression
bsc
default.nix
top-level
all-packages.nix
+8
-1
pkgs/tools/compression/bsc/default.nix
reviewed
···
1
1
-
{ stdenv, fetchurl } :
1
1
+
{ stdenv, fetchurl, openmp ? null }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "bsc-${version}";
···
10
10
};
11
11
12
12
enableParallelBuilding = true;
13
13
+
14
14
+
buildInputs = stdenv.lib.optional stdenv.isDarwin openmp;
15
15
+
16
16
+
prePatch = ''
17
17
+
substituteInPlace makefile \
18
18
+
--replace 'g++' '$(CXX)'
19
19
+
'';
13
20
14
21
preInstall = ''
15
22
makeFlagsArray+=("PREFIX=$out")
+3
-1
pkgs/top-level/all-packages.nix
reviewed
···
1296
1296
1297
1297
atool = callPackage ../tools/archivers/atool { };
1298
1298
1299
1299
-
bsc = callPackage ../tools/compression/bsc { };
1299
1299
+
bsc = callPackage ../tools/compression/bsc {
1300
1300
+
inherit (llvmPackages) openmp;
1301
1301
+
};
1300
1302
1301
1303
bzip2 = callPackage ../tools/compression/bzip2 { };
1302
1304