fix tarball job evaluation for aarch64-darwin
This commit is contained in:
parent
ccb99f68e5
commit
9e6417f2a4
|
@ -6,6 +6,8 @@
|
||||||
, setJavaClassPath
|
, setJavaClassPath
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
assert (stdenv.isDarwin && stdenv.isx86_64);
|
||||||
|
|
||||||
let cpuName = stdenv.hostPlatform.parsed.cpu.name;
|
let cpuName = stdenv.hostPlatform.parsed.cpu.name;
|
||||||
result = stdenv.mkDerivation {
|
result = stdenv.mkDerivation {
|
||||||
name = if sourcePerArch.packageType == "jdk"
|
name = if sourcePerArch.packageType == "jdk"
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
, buildLlvmTools
|
, buildLlvmTools
|
||||||
, fixDarwinDylibNames
|
, fixDarwinDylibNames
|
||||||
, enableManpages ? false
|
, enableManpages ? false
|
||||||
|
, enablePolly ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -39,8 +40,12 @@ let
|
||||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||||
"-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
"-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||||
"-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen"
|
"-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen"
|
||||||
|
] ++ lib.optionals enablePolly [
|
||||||
|
"-DWITH_POLLY=ON"
|
||||||
|
"-DLINK_POLLY_INTO_TOOLS=ON"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./purity.patch
|
./purity.patch
|
||||||
# https://reviews.llvm.org/D51899
|
# https://reviews.llvm.org/D51899
|
||||||
|
|
|
@ -68,16 +68,30 @@ let
|
||||||
# we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
|
# we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
|
||||||
llvm = tools.libllvm.out // { outputUnspecified = true; };
|
llvm = tools.libllvm.out // { outputUnspecified = true; };
|
||||||
|
|
||||||
|
libllvm-polly = callPackage ./llvm {
|
||||||
|
inherit llvm_meta;
|
||||||
|
enablePolly = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };
|
||||||
|
|
||||||
libclang = callPackage ./clang {
|
libclang = callPackage ./clang {
|
||||||
inherit clang-tools-extra_src llvm_meta;
|
inherit clang-tools-extra_src llvm_meta;
|
||||||
};
|
};
|
||||||
|
|
||||||
clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
|
clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
|
||||||
# disabled until recommonmark supports sphinx 3
|
|
||||||
#Llvm-manpages = lowPrio (tools.libllvm.override {
|
clang-polly-unwrapped = callPackage ./clang {
|
||||||
# enableManpages = true;
|
inherit llvm_meta;
|
||||||
# python3 = pkgs.python3; # don't use python-boot
|
inherit clang-tools-extra_src;
|
||||||
#});
|
libllvm = tools.libllvm-polly;
|
||||||
|
enablePolly = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
llvm-manpages = lowPrio (tools.libllvm.override {
|
||||||
|
enableManpages = true;
|
||||||
|
python3 = pkgs.python3; # don't use python-boot
|
||||||
|
});
|
||||||
|
|
||||||
clang-manpages = lowPrio (tools.libclang.override {
|
clang-manpages = lowPrio (tools.libclang.override {
|
||||||
enableManpages = true;
|
enableManpages = true;
|
||||||
|
|
|
@ -119,6 +119,20 @@ in rec {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sandbox = stdenv.mkDerivation {
|
||||||
|
name = "apple-lib-sandbox";
|
||||||
|
|
||||||
|
dontUnpack = true;
|
||||||
|
dontBuild = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/include $out/lib
|
||||||
|
ln -s "${MacOSX-SDK}/usr/include/sandbox.h" $out/include/sandbox.h
|
||||||
|
cp "${MacOSX-SDK}/usr/lib/libsandbox.1.tbd" $out/lib
|
||||||
|
ln -s libsandbox.1.tbd $out/lib/libsandbox.tbd
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
libDER = stdenv.mkDerivation {
|
libDER = stdenv.mkDerivation {
|
||||||
name = "apple-lib-libDER";
|
name = "apple-lib-libDER";
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
@ -133,6 +147,10 @@ in rec {
|
||||||
CoreFoundation = lib.overrideDerivation super.CoreFoundation (drv: {
|
CoreFoundation = lib.overrideDerivation super.CoreFoundation (drv: {
|
||||||
setupHook = ./cf-setup-hook.sh;
|
setupHook = ./cf-setup-hook.sh;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
# This framework doesn't exist in newer SDKs (somewhere around 10.13), but
|
||||||
|
# there are references to it in nixpkgs.
|
||||||
|
QuickTime = throw "QuickTime framework not available";
|
||||||
};
|
};
|
||||||
|
|
||||||
bareFrameworks = (
|
bareFrameworks = (
|
||||||
|
|
|
@ -14,4 +14,5 @@
|
||||||
URLFormatting = {};
|
URLFormatting = {};
|
||||||
SignpostMetrics = {};
|
SignpostMetrics = {};
|
||||||
PassKitCore = {};
|
PassKitCore = {};
|
||||||
|
SkyLight = {};
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ let
|
||||||
# checking, only whitelist licenses used by notable
|
# checking, only whitelist licenses used by notable
|
||||||
# libcs in nixpkgs (musl and glibc).
|
# libcs in nixpkgs (musl and glibc).
|
||||||
compatible = lib: drv:
|
compatible = lib: drv:
|
||||||
lib.any (lic: lic == drv.meta.license) [
|
lib.any (lic: lic == (drv.meta.license or {})) [
|
||||||
lib.licenses.mit # musl
|
lib.licenses.mit # musl
|
||||||
lib.licenses.lgpl2Plus # glibc
|
lib.licenses.lgpl2Plus # glibc
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{ lib, stdenv
|
{ lib, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, apple_sdk ? null
|
|
||||||
, libbsd
|
, libbsd
|
||||||
, libressl
|
, libressl
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -18,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ libbsd libressl ] ++ optional stdenv.isDarwin apple_sdk.sdk;
|
buildInputs = [ libbsd libressl ];
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||||
|
|
||||||
|
|
|
@ -786,7 +786,7 @@ in
|
||||||
|
|
||||||
aescrypt = callPackage ../tools/misc/aescrypt { };
|
aescrypt = callPackage ../tools/misc/aescrypt { };
|
||||||
|
|
||||||
acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; stdenv = gccStdenv; };
|
acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; };
|
||||||
|
|
||||||
amass = callPackage ../tools/networking/amass { };
|
amass = callPackage ../tools/networking/amass { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue