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

Merge pull request #27407 from obsidiansystems/null-configure-flags

Browse Source 
mkDerivation: Fix errors from #27365
This commit is contained in:
John Ericson 2017-07-15 15:56:29 -04:00 committed by GitHub
commit 7d95391f6a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,9 +98,11 @@ rec {
propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0; propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0;
propagatedBuildInputs = lib.elemAt propagatedDependencies' 1; propagatedBuildInputs = lib.elemAt propagatedDependencies' 1;
# This parameter is sometimes a string and sometimes a list, yuck # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
configureFlags = let inherit (lib) optional elem; in configureFlags = let inherit (lib) optional elem; in
(if lib.isString configureFlags then [configureFlags] else configureFlags) (/**/ if lib.isString configureFlags then [configureFlags]
else if configureFlags == null then []
else configureFlags)
++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}" ++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}"
++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}"
++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}";

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

@ -3609,7 +3609,7 @@ with pkgs;
(attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ]; (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ];
# Fix this build error in ./tests/examples/waylandsink: # Fix this build error in ./tests/examples/waylandsink:
# main.c:28:2: error: #error "Wayland is not supported in GTK+" # main.c:28:2: error: #error "Wayland is not supported in GTK+"
configureFlags = attrs.configureFlags or "" + "--enable-wayland=no"; configureFlags = attrs.configureFlags or [] ++ [ "--enable-wayland=no" ];
}); });
}; };
}; };