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

appimageTools: wrapType1 = wrapType2;

Browse Source
This commit is contained in:
Bignaux Ronan 2020-03-08 17:55:43 +01:00
parent 95dc1ef1f0
commit 49e7871196
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,8 +20,7 @@ rec {
# for compatibility, deprecated # for compatibility, deprecated
extractType1 = extract; extractType1 = extract;
extractType2 = extract; extractType2 = extract;
#wrapType2 = wrapAppImage; wrapType1 = wrapType2;
#wrapType1 = wrapAppImage;
wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // { wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // {
inherit name; inherit name;
@ -32,14 +31,9 @@ rec {
runScript = "appimage-exec.sh -w -d ${src}"; runScript = "appimage-exec.sh -w -d ${src}";
} // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
inherit name extraPkgs;
src = extractType1 { inherit name src; };
});
wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
inherit name extraPkgs; inherit name extraPkgs;
src = extractType2 { inherit name src; }; src = extract { inherit name src; };
}); });
defaultFhsEnvArgs = { defaultFhsEnvArgs = {