diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:16:45 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:16:45 +0100 |
commit | 6d1958ad2dda67aa4f667d2283781949c8d18303 (patch) | |
tree | 56cb000fe8a66aaa690a61dae410a86bebde2b56 /pkgs/build-support | |
parent | 9f7ce23482602164afe4f0a339f20879bf7df6cc (diff) | |
parent | a992d6867108fa317f461becc92a7f36a59bac61 (diff) |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 3 | ||||
-rw-r--r-- | pkgs/build-support/build-bazel-package/default.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/build-pecl.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 5 | ||||
-rw-r--r-- | pkgs/build-support/docker/default.nix | 3 | ||||
-rw-r--r-- | pkgs/build-support/fetchs3/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/writers/test.nix | 1 |
7 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index c255f43dfcd8..dac1f3bd7c10 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -53,7 +53,8 @@ let dynamicLinker = /**/ if libc == null then null else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*" - else if targetPlatform.libc == "bionic" then "/system/bin/linker" + else if (targetPlatform.libc == "bionic" && targetPlatform.is32bit) then "/system/bin/linker" + else if (targetPlatform.libc == "bionic" && targetPlatform.is64bit) then "/system/bin/linker64" else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 3be72bd22c3f..988298ac72bf 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -108,8 +108,8 @@ in stdenv.mkDerivation (fBuildAttrs // { rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker} ${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""} rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker} - ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\@local_config_cc.marker}" else ""} - ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\@local_*.marker}" else ""} + ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}" else ""} + ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}" else ""} # Clear markers find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \; diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index bc905ee84a06..d75d3cf943a0 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -16,10 +16,10 @@ }@args: stdenv.mkDerivation (args // { - pname = "php-${php.version}-${pname}"; + name = "php-${pname}-${version}"; extensionName = pname; - inherit version src; + inherit src; nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; buildInputs = [ php ] ++ peclDeps ++ buildInputs; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 06e43b6ea5f1..8f20abc560a2 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -298,7 +298,10 @@ stdenv.mkDerivation { # vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See # https://clang.llvm.org/docs/Toolchain.html for all the axes one might # break `useLLVM` into.) - + optionalString (isClang && gccForLibs != null && targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + + optionalString (isClang && gccForLibs != null + && targetPlatform.isLinux + && !(stdenv.targetPlatform.useAndroidPrebuilt or false) + && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags '' diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index c4e266d6c5d1..4d57b3991998 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -21,7 +21,6 @@ runtimeShell, shadow, skopeo, - stdenv, storeDir ? builtins.storeDir, substituteAll, symlinkJoin, @@ -120,7 +119,7 @@ rec { export GOPATH=$(pwd) export GOCACHE="$TMPDIR/go-cache" mkdir -p src/github.com/docker/docker/pkg - ln -sT ${docker.moby.src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum + ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum go build mkdir -p $out/bin diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index 8c551c20aa04..acad0749b663 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, runCommand, awscli }: +{ lib, runCommand, awscli }: { s3url , name ? builtins.baseNameOf s3url diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 7b7a698376a1..a3f15ffe366c 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -7,7 +7,6 @@ python2Packages, python3Packages, runCommand, - stdenv, writers, writeText }: |