From 9e6417f2a4e0431dc1c9cb86bd38161c4f0f53a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 1 Jun 2021 11:19:52 +0200 Subject: [PATCH] fix tarball job evaluation for aarch64-darwin --- .../adoptopenjdk-bin/jdk-darwin-base.nix | 2 ++ .../compilers/llvm/11/clang/default.nix | 5 ++++ .../development/compilers/llvm/11/default.nix | 24 +++++++++++++++---- .../darwin/apple-sdk-11.0/apple_sdk.nix | 18 ++++++++++++++ .../apple-sdk-11.0/private-frameworks.nix | 1 + pkgs/servers/irc/inspircd/default.nix | 2 +- pkgs/tools/networking/acme-client/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 2 +- 8 files changed, 48 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 71a55c68290c..bcd3309fc398 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -6,6 +6,8 @@ , setJavaClassPath }: +assert (stdenv.isDarwin && stdenv.isx86_64); + let cpuName = stdenv.hostPlatform.parsed.cpu.name; result = stdenv.mkDerivation { name = if sourcePerArch.packageType == "jdk" diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index f23394a8b754..74078c1ac667 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -2,6 +2,7 @@ , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false +, enablePolly ? false }: let @@ -39,8 +40,12 @@ let ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" + ] ++ lib.optionals enablePolly [ + "-DWITH_POLLY=ON" + "-DLINK_POLLY_INTO_TOOLS=ON" ]; + patches = [ ./purity.patch # https://reviews.llvm.org/D51899 diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 3c6d767561ee..1aad123fba9a 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -68,16 +68,30 @@ let # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* 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 { inherit clang-tools-extra_src llvm_meta; }; clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; - # disabled until recommonmark supports sphinx 3 - #Llvm-manpages = lowPrio (tools.libllvm.override { - # enableManpages = true; - # python3 = pkgs.python3; # don't use python-boot - #}); + + clang-polly-unwrapped = callPackage ./clang { + inherit llvm_meta; + 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 { enableManpages = true; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix index a4242405b411..14945380e20c 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix @@ -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 { name = "apple-lib-libDER"; dontUnpack = true; @@ -133,6 +147,10 @@ in rec { CoreFoundation = lib.overrideDerivation super.CoreFoundation (drv: { 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 = ( diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix index 48b373bbd22c..bb4300d623a4 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix @@ -14,4 +14,5 @@ URLFormatting = {}; SignpostMetrics = {}; PassKitCore = {}; + SkyLight = {}; } diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/servers/irc/inspircd/default.nix index 561151bfa754..59fb4d4e769c 100644 --- a/pkgs/servers/irc/inspircd/default.nix +++ b/pkgs/servers/irc/inspircd/default.nix @@ -23,7 +23,7 @@ let # checking, only whitelist licenses used by notable # libcs in nixpkgs (musl and glibc). compatible = lib: drv: - lib.any (lic: lic == drv.meta.license) [ + lib.any (lic: lic == (drv.meta.license or {})) [ lib.licenses.mit # musl lib.licenses.lgpl2Plus # glibc ]; diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index 728fde4b1e45..f20d4eefb479 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, apple_sdk ? null , libbsd , libressl , pkg-config @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libbsd libressl ] ++ optional stdenv.isDarwin apple_sdk.sdk; + buildInputs = [ libbsd libressl ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f46af73ea7c..4ceb48488c76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -786,7 +786,7 @@ in 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 { };