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

zroc-ice: cleanup and fix darwin build

Browse Source
This commit is contained in:
Daiderd Jordan 2017-09-21 20:05:29 +02:00
parent a3ba600366
commit 1ae204d2fa
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/zeroc-ice/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5 }:
{ stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5
, darwin, libiconv, Security
}:
stdenv.mkDerivation rec {
name = "zeroc-ice-${version}";
@ -11,17 +13,20 @@ stdenv.mkDerivation rec {
sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2";
};
buildInputs = [ mcpp bzip2 expat openssl db5 ];
buildInputs = [ mcpp bzip2 expat openssl db5 ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
buildPhase = ''
cd cpp
make -j $NIX_BUILD_CORES OPTIMIZE=yes
postUnpack = ''
sourceRoot=$sourceRoot/cpp
'';
installPhase = ''
make -j $NIX_BUILD_CORES prefix=$out install
prePatch = ''
substituteInPlace config/Make.rules.Darwin \
--replace xcrun ""
'';
makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {

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

@ -17208,7 +17208,9 @@ with pkgs;
zed = callPackage ../applications/editors/zed { };
zeroc_ice = callPackage ../development/libraries/zeroc-ice { };
zeroc_ice = callPackage ../development/libraries/zeroc-ice {
inherit (darwin.apple_sdk.frameworks) Security;
};
zexy = callPackage ../applications/audio/pd-plugins/zexy { };