mirror of
https://github.com/nix-community/dream2nix.git
synced 2025-01-09 00:08:02 +03:00
nixpkgs-overrides: map env field correctly
Now that mkDerivation also has an `env` flag, we need to make sure to not forward this to mkDerivation, as we have our own env option.
This commit is contained in:
parent
652ff77437
commit
916bca75a1
@ -38,16 +38,18 @@
|
||||
extracted;
|
||||
|
||||
extractedEnv =
|
||||
l.filterAttrs
|
||||
(
|
||||
name: _:
|
||||
! (
|
||||
extractedMkDerivation
|
||||
? ${name}
|
||||
|| extractedBuildPythonPackage ? ${name}
|
||||
)
|
||||
)
|
||||
extracted;
|
||||
(l.filterAttrs
|
||||
(
|
||||
name: _:
|
||||
! (
|
||||
extractedMkDerivation
|
||||
? ${name}
|
||||
|| extractedBuildPythonPackage ? ${name}
|
||||
)
|
||||
&& name != "env"
|
||||
)
|
||||
extracted)
|
||||
// extracted.env or {};
|
||||
in {
|
||||
imports = [
|
||||
./interface.nix
|
||||
|
Loading…
Reference in New Issue
Block a user