idrisPackages: Fix overrides not applying (#65794)

idrisPackages: Fix overrides not applying
This commit is contained in:
Silvan Mosberger 2019-08-03 16:24:06 +02:00 committed by GitHub
commit 42d4680fdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
# Build an idris package # Build an idris package
{ stdenv, lib, idrisPackages, gmp }: { stdenv, lib, gmp, prelude, base, with-packages, idris }:
{ idrisDeps ? [] { idrisDeps ? []
, noPrelude ? false , noPrelude ? false
, noBase ? false , noBase ? false
@ -11,15 +11,15 @@
}@attrs: }@attrs:
let let
allIdrisDeps = idrisDeps allIdrisDeps = idrisDeps
++ lib.optional (!noPrelude) idrisPackages.prelude ++ lib.optional (!noPrelude) prelude
++ lib.optional (!noBase) idrisPackages.base; ++ lib.optional (!noBase) base;
idris-with-packages = idrisPackages.with-packages allIdrisDeps; idris-with-packages = with-packages allIdrisDeps;
newAttrs = builtins.removeAttrs attrs [ newAttrs = builtins.removeAttrs attrs [
"idrisDeps" "noPrelude" "noBase" "idrisDeps" "noPrelude" "noBase"
"name" "version" "ipkgName" "extraBuildInputs" "name" "version" "ipkgName" "extraBuildInputs"
] // { ] // {
meta = attrs.meta // { meta = attrs.meta // {
platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms; platforms = attrs.meta.platforms or idris.meta.platforms;
}; };
}; };
in in