nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-20 11:05:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

avian: fix darwin build

Browse Source 
/cc ZHF #36454
This commit is contained in:
Daiderd Jordan 2018-03-14 20:36:47 +01:00
parent a3d4aab1db
commit db691029d6
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/compilers/avian/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, zlib, jdk }:
{ stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
stdenv.mkDerivation rec {
name = "avian-${version}";
@ -11,10 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48";
};
buildInputs = [
zlib
jdk
];
buildInputs = [ zlib jdk ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Foundation ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error";
postPatch = ''
substituteInPlace makefile \
--replace 'g++' 'c++' \
--replace 'gcc' 'cc'
'';
installPhase = ''
mkdir -p $out/bin

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

@ -5769,7 +5769,8 @@ with pkgs;
avra = callPackage ../development/compilers/avra { };
avian = callPackage ../development/compilers/avian {
stdenv = overrideCC stdenv gcc49;
inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
stdenv = if stdenv.cc.isGNU then overrideCC stdenv gcc49 else stdenv;
};
bigloo = callPackage ../development/compilers/bigloo { };