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

nodePackages.expo-cli: use .override

Browse Source 
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.
This commit is contained in:
Jan Tojnar 2020-10-08 09:43:53 +02:00
parent 4f36ce4aff
commit 94447e06b4
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/node-packages/default.nix
View File

@ -59,8 +59,7 @@ let
buildInputs = [ pkgs.phantomjs2 ]; buildInputs = [ pkgs.phantomjs2 ];
}; };
expo-cli = super."expo-cli".overrideNodeAttrs (attrs: { expo-cli = super."expo-cli".override (attrs: {
__acceptOverrideNodeAttrsCanBeDroppedAnytime = true;
# The traveling-fastlane-darwin optional dependency aborts build on Linux. # The traveling-fastlane-darwin optional dependency aborts build on Linux.
dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") attrs.dependencies; dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") attrs.dependencies;
}); });

33
pkgs/development/node-packages/node-env.nix
View File

@ -372,37 +372,8 @@ let
fi 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 # Builds and composes an NPM package including all its dependencies
buildNodePackage = makeOverridableNodePackage ( buildNodePackage =
{ name { name
, packageName , packageName
, version , version
@ -472,7 +443,7 @@ let
# Run post install hook, if provided # Run post install hook, if provided
runHook postInstall runHook postInstall
''; '';
} // extraArgs)); } // extraArgs);
# Builds a development shell # Builds a development shell
buildNodeShell = buildNodeShell =