dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #54801 from matthewbauer/fix-trace-pos

Browse Source 
make-derivation: fix position in trace
This commit is contained in:
Matthew Bauer 2019-01-31 10:44:21 -05:00 committed by GitHub
commit ab118f3847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/windows/mingw-w64/default.nix
View File

@ -21,6 +21,6 @@ in stdenv.mkDerivation {
patches = [ ./osvi.patch ]; patches = [ ./osvi.patch ];
meta = { meta = {
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.windows;
}; };
} }

24
pkgs/stdenv/generic/make-derivation.nix
View File

@ -81,8 +81,6 @@ rec {
, ... } @ attrs: , ... } @ attrs:
let let
computedName = if name != "" then name else "${attrs.pname}-${attrs.version}";
# TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
# no package has `doCheck = true`. # no package has `doCheck = true`.
doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform; doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform;
@ -96,7 +94,7 @@ rec {
++ depsHostHost ++ depsHostHostPropagated ++ depsHostHost ++ depsHostHostPropagated
++ buildInputs ++ propagatedBuildInputs ++ buildInputs ++ propagatedBuildInputs
++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || stdenv.cc == null; dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || (stdenv.noCC or false);
supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
defaultHardeningFlags = if stdenv.hostPlatform.isMusl defaultHardeningFlags = if stdenv.hostPlatform.isMusl
then supportedHardeningFlags then supportedHardeningFlags
@ -179,15 +177,15 @@ rec {
"checkInputs" "installCheckInputs" "checkInputs" "installCheckInputs"
"__impureHostDeps" "__propagatedImpureHostDeps" "__impureHostDeps" "__propagatedImpureHostDeps"
"sandboxProfile" "propagatedSandboxProfile"]) "sandboxProfile" "propagatedSandboxProfile"])
// { // (lib.optionalAttrs (name == "")) {
name = computedName + lib.optionalString name = "${attrs.pname}-${attrs.version}";
# Fixed-output derivations like source tarballs shouldn't get a host } // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)) {
# suffix. But we have some weird ones with run-time deps that are # Fixed-output derivations like source tarballs shouldn't get a host
# just used for their side-affects. Those might as well since the # suffix. But we have some weird ones with run-time deps that are
# hash can't be the same. See #32986. # just used for their side-affects. Those might as well since the
(stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix) # hash can't be the same. See #32986.
("-" + stdenv.hostPlatform.config); name = "${if name != "" then name else "${attrs.pname}-${attrs.version}"}-${stdenv.hostPlatform.config}";
} // {
builder = attrs.realBuilder or stdenv.shell; builder = attrs.realBuilder or stdenv.shell;
args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
inherit stdenv; inherit stdenv;
@ -276,7 +274,7 @@ rec {
meta = { meta = {
# `name` above includes cross-compilation cruft (and is under assert), # `name` above includes cross-compilation cruft (and is under assert),
# lets have a clean always accessible version here. # lets have a clean always accessible version here.
name = computedName; name = if name != "" then name else "${attrs.pname}-${attrs.version}";
# If the packager hasn't specified `outputsToInstall`, choose a default, # If the packager hasn't specified `outputsToInstall`, choose a default,
# which is the name of `p.bin or p.out or p`; # which is the name of `p.bin or p.out or p`;

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

@ -33,7 +33,7 @@ in
# just the plain stdenv. # just the plain stdenv.
stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv); stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv);
stdenvNoCC = stdenv.override { cc = null; }; stdenvNoCC = stdenv.override { cc = null; extraAttrs.noCC = true; };
stdenvNoLibs = let stdenvNoLibs = let
bintools = stdenv.cc.bintools.override { bintools = stdenv.cc.bintools.override {
@ -6780,7 +6780,7 @@ in
# built with, and use, that cross-compiled libc. # built with, and use, that cross-compiled libc.
gccCrossStageStatic = assert stdenv.targetPlatform != stdenv.hostPlatform; let gccCrossStageStatic = assert stdenv.targetPlatform != stdenv.hostPlatform; let
libcCross1 = libcCross1 =
if stdenv.targetPlatform.libc == "msvcrt" then windows.mingw_w64_headers if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers
else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode
else null; else null;
binutils1 = wrapBintoolsWith { binutils1 = wrapBintoolsWith {