public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-11-22 09:57:08 +01:00
parent 16267b4389 9467621b18
commit c31cb577ae
122 changed files with 2802 additions and 902 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/generic/make-derivation.nix
+3 -3
View File
@@ -249,12 +249,12 @@ rec {
# propagated dependencies here as well.
disallowedReferences = (attrs.disallowedReferences or [])
++ (lib.subtractLists
(lib.concatLists ( (lib.elemAt propagatedDependencies 1) ++
(lib.concatLists ((lib.elemAt propagatedDependencies 0) ++
(lib.elemAt propagatedDependencies 1) ++
(lib.elemAt dependencies 1) ++
(lib.elemAt propagatedDependencies 2) ++
(lib.elemAt dependencies 2) ) )
(lib.concatLists ( (lib.elemAt propagatedDependencies 0) ++
(lib.elemAt dependencies 0) ) ) );
(lib.concatLists ((lib.elemAt dependencies 0)) ) );
} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
cmakeFlags =
(/**/ if lib.isString cmakeFlags then [cmakeFlags]