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

appimage: plumb support for extra attributes to be specified

Browse Source
This commit is contained in:
Will Dietz 2019-02-12 22:31:35 -06:00
parent 6088a4793f
commit fb771b072a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/build-support/appimage/default.nix
View File

@ -33,7 +33,7 @@ rec {
''; '';
}; };
wrapAppImage = { name, src, extraPkgs }: buildFHSUserEnv (defaultFhsEnvArgs // { wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // {
inherit name; inherit name;
targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
@ -46,17 +46,17 @@ rec {
cd $APPDIR cd $APPDIR
exec ./AppRun "$@" exec ./AppRun "$@"
''; '';
}); } // (builtins.removeAttrs args [ "name" "src" "extraPkgs" ]));
wrapType1 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
inherit name extraPkgs; inherit name extraPkgs;
src = extractType1 { inherit name src; }; src = extractType1 { inherit name src; };
}; });
wrapType2 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
inherit name extraPkgs; inherit name extraPkgs;
src = extractType2 { inherit name src; }; src = extractType2 { inherit name src; };
}; });
defaultFhsEnvArgs = { defaultFhsEnvArgs = {
name = "appimage-env"; name = "appimage-env";