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

Merge pull request #100015 from NixOS/expo-cli-fix

Browse Source 
nodePackages.expo-cli: use .override
This commit is contained in:
Jan Tojnar 2020-10-08 16:17:16 +02:00 committed by GitHub
commit fc6e61b1c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 ];
};
expo-cli = super."expo-cli".overrideNodeAttrs (attrs: {
__acceptOverrideNodeAttrsCanBeDroppedAnytime = true;
expo-cli = super."expo-cli".override (attrs: {
# 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;
});

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

@ -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 =