tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
zroc-ice: cleanup and fix darwin build
Daiderd Jordan
8 years ago
1ae204d2
a3ba6003
+15
-8
2 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
zeroc-ice
default.nix
top-level
all-packages.nix
+12
-7
pkgs/development/libraries/zeroc-ice/default.nix
···
1
1
-
{ stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5 }:
1
1
+
{ stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5
2
2
+
, darwin, libiconv, Security
3
3
+
}:
2
4
3
5
stdenv.mkDerivation rec {
4
6
name = "zeroc-ice-${version}";
···
11
13
sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2";
12
14
};
13
15
14
14
-
buildInputs = [ mcpp bzip2 expat openssl db5 ];
16
16
+
buildInputs = [ mcpp bzip2 expat openssl db5 ]
17
17
+
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
15
18
16
16
-
buildPhase = ''
17
17
-
cd cpp
18
18
-
make -j $NIX_BUILD_CORES OPTIMIZE=yes
19
19
+
postUnpack = ''
20
20
+
sourceRoot=$sourceRoot/cpp
19
21
'';
20
22
21
21
-
installPhase = ''
22
22
-
make -j $NIX_BUILD_CORES prefix=$out install
23
23
+
prePatch = ''
24
24
+
substituteInPlace config/Make.rules.Darwin \
25
25
+
--replace xcrun ""
23
26
'';
27
27
+
28
28
+
makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ];
24
29
25
30
enableParallelBuilding = true;
26
31
+3
-1
pkgs/top-level/all-packages.nix
···
17208
17208
17209
17209
zed = callPackage ../applications/editors/zed { };
17210
17210
17211
17211
-
zeroc_ice = callPackage ../development/libraries/zeroc-ice { };
17211
17211
+
zeroc_ice = callPackage ../development/libraries/zeroc-ice {
17212
17212
+
inherit (darwin.apple_sdk.frameworks) Security;
17213
17213
+
};
17212
17214
17213
17215
zexy = callPackage ../applications/audio/pd-plugins/zexy { };
17214
17216