lol

zroc-ice: cleanup and fix darwin build

+15 -8
+12 -7
pkgs/development/libraries/zeroc-ice/default.nix
··· 1 - { stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5 }: 2 3 stdenv.mkDerivation rec { 4 name = "zeroc-ice-${version}"; ··· 11 sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2"; 12 }; 13 14 - buildInputs = [ mcpp bzip2 expat openssl db5 ]; 15 16 - buildPhase = '' 17 - cd cpp 18 - make -j $NIX_BUILD_CORES OPTIMIZE=yes 19 ''; 20 21 - installPhase = '' 22 - make -j $NIX_BUILD_CORES prefix=$out install 23 ''; 24 25 enableParallelBuilding = true; 26
··· 1 + { stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5 2 + , darwin, libiconv, Security 3 + }: 4 5 stdenv.mkDerivation rec { 6 name = "zeroc-ice-${version}"; ··· 13 sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2"; 14 }; 15 16 + buildInputs = [ mcpp bzip2 expat openssl db5 ] 17 + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; 18 19 + postUnpack = '' 20 + sourceRoot=$sourceRoot/cpp 21 ''; 22 23 + prePatch = '' 24 + substituteInPlace config/Make.rules.Darwin \ 25 + --replace xcrun "" 26 ''; 27 + 28 + makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ]; 29 30 enableParallelBuilding = true; 31
+3 -1
pkgs/top-level/all-packages.nix
··· 17208 17209 zed = callPackage ../applications/editors/zed { }; 17210 17211 - zeroc_ice = callPackage ../development/libraries/zeroc-ice { }; 17212 17213 zexy = callPackage ../applications/audio/pd-plugins/zexy { }; 17214
··· 17208 17209 zed = callPackage ../applications/editors/zed { }; 17210 17211 + zeroc_ice = callPackage ../development/libraries/zeroc-ice { 17212 + inherit (darwin.apple_sdk.frameworks) Security; 17213 + }; 17214 17215 zexy = callPackage ../applications/audio/pd-plugins/zexy { }; 17216