diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-10-08 09:43:53 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-08 09:43:53 +0200 |
commit | 94447e06b4cd7c288d6f0e8d1913d46d4cb7d614 (patch) | |
tree | 5d0836b02bb0445ce89db8e18c6fc94dd6f5f95a /pkgs/development/node-packages/node-env.nix | |
parent | 4f36ce4affb13c8b165c6f8e3d2b1489698af35d (diff) |
nodePackages.expo-cli: use .override
generate.sh seems to remove changes to node-env.nix, fortunately .override seems to work so .overrideNodeAttrs does not actually seem necessary. Not sure why I did not use it before.
Diffstat (limited to 'pkgs/development/node-packages/node-env.nix')
-rw-r--r-- | pkgs/development/node-packages/node-env.nix | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index b30df577f20d9..e1abf53049350 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -372,37 +372,8 @@ let fi ''; - # Derivations built with `buildNodePackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`. - # This function introduces `overrideNodeAttrs` and it overrides the call to `buildNodePackage`. - # - # THIS FUNCTION IS TEMPORARY until we have a better mechanism in place: - # https://github.com/NixOS/nixpkgs/pull/96509#issuecomment-682381592 - # YOU SHOULD NOT USE IT UNLESS YOU ACCEPT THAT. - makeOverridableNodePackage = f: origArgs: - let - ff = f origArgs; - overrideWith = newArgs: origArgs // ( - let args = if stdenv.lib.isFunction newArgs then newArgs origArgs else newArgs; - in - assert stdenv.lib.assertMsg (args.__acceptOverrideNodeAttrsCanBeDroppedAnytime or false) '' - overrideNodeAttrs is temporary function that will be removed once a better mechanism exists. - Pass it `__acceptOverrideNodeAttrsCanBeDroppedAnytime = true;` to aknowledge the fact. - ''; - builtins.removeAttrs args [ "__acceptOverrideNodeAttrsCanBeDroppedAnytime" ] - ); - in - if builtins.isAttrs ff then (ff // { - overrideNodeAttrs = newArgs: makeOverridableNodePackage f (overrideWith newArgs); - }) - else if builtins.isFunction ff then { - overrideNodeAttrs = newArgs: makeOverridableNodePackage f (overrideWith newArgs); - __functor = self: ff; - } - else ff; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = makeOverridableNodePackage ( + buildNodePackage = { name , packageName , version @@ -472,7 +443,7 @@ let # Run post install hook, if provided runHook postInstall ''; - } // extraArgs)); + } // extraArgs); # Builds a development shell buildNodeShell = |