Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b5cf1d2e5079
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8f54d931cd14
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 7, 2018

  1. stdenv cross adapter: Get rid if selfNativeBuildInput 

    It is finally no longer used anywhere

Fixes #30587
    @Ericson2314
    Ericson2314 committed Mar 7, 2018
    Copy the full SHA
    8d58008 View commit details

  2. Merge pull request #36401 from obsidiansystems/no-stdenv-cross-adapter 

    stdenv cross adapter: Get rid if `selfNativeBuildInput`
    @Ericson2314
    Ericson2314 authored Mar 7, 2018
    Copy the full SHA
    8f54d93 View commit details
Showing with 0 additions and 11 deletions.
  1. +0 −11 pkgs/stdenv/adapters.nix
11 changes: 0 additions & 11 deletions pkgs/stdenv/adapters.nix
View file
Original file line number Diff line number Diff line change
@@ -75,22 +75,11 @@ rec {
in stdenv // {
mkDerivation =
{ nativeBuildInputs ? []
, selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false
, ...
} @ args:

let
# *BuildInputs exists temporarily as another name for
# *HostInputs.

# The base stdenv already knows that nativeBuildInputs and
# buildInputs should be built with the usual gcc-wrapper
# And the same for propagatedBuildInputs.
nativeDrv = stdenv.mkDerivation args;
in
stdenv.mkDerivation (args // {
nativeBuildInputs = nativeBuildInputs
++ stdenv.lib.optional selfNativeBuildInput nativeDrv
# without proper `file` command, libtool sometimes fails
# to recognize 64-bit DLLs
++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file