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: 62d375e3d7bb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58f6dc6d0679
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 13, 2019

  1. make-derivation: assert that configureFlags is a flat list 

    Otherwise, flags will be passed improperly to configure scripts (see
also 62d375e and https://hydra.nixos.org/build/106303610)
    @Ma27
    Ma27 committed Nov 13, 2019
    Copy the full SHA
    58f6dc6 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/stdenv/generic/make-derivation.nix
3 changes: 2 additions & 1 deletion pkgs/stdenv/generic/make-derivation.nix
View file
Original file line number Diff line number Diff line change
@@ -292,7 +292,8 @@ in rec {
deps;

# This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
configureFlags = let inherit (lib) elem optional; in configureFlags
configureFlags = let inherit (lib) elem optional; in
assert (lib.all (n: !builtins.isList n && !builtins.isAttrs n) configureFlags); configureFlags
++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}"
++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}"
++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}";