diff options
| author | Bignaux Ronan <ronan@aimao.org> | 2020-03-08 17:55:43 +0100 |
|---|---|---|
| committer | Bignaux Ronan <ronan@aimao.org> | 2020-03-08 18:07:04 +0100 |
| commit | 49e7871196ea43f6b8b6c81801f632f57ab892de (patch) | |
| tree | a5848df90bce8bf655dcee8031413ae49721011b /pkgs/build-support/appimage | |
| parent | 95dc1ef1f0d5da42f3b92d9af00cbb0179cb5ecf (diff) | |
| download | nixpkgs-49e7871196ea43f6b8b6c81801f632f57ab892de.tar nixpkgs-49e7871196ea43f6b8b6c81801f632f57ab892de.tar.gz nixpkgs-49e7871196ea43f6b8b6c81801f632f57ab892de.tar.bz2 nixpkgs-49e7871196ea43f6b8b6c81801f632f57ab892de.tar.lz nixpkgs-49e7871196ea43f6b8b6c81801f632f57ab892de.tar.xz nixpkgs-49e7871196ea43f6b8b6c81801f632f57ab892de.tar.zst nixpkgs-49e7871196ea43f6b8b6c81801f632f57ab892de.zip | |
appimageTools: wrapType1 = wrapType2;
Diffstat (limited to 'pkgs/build-support/appimage')
| -rw-r--r-- | pkgs/build-support/appimage/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 4df0f15d84d..eb9a2a5ee08 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -20,8 +20,7 @@ rec { # for compatibility, deprecated extractType1 = extract; extractType2 = extract; - #wrapType2 = wrapAppImage; - #wrapType1 = wrapAppImage; + wrapType1 = wrapType2; wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // { inherit name; @@ -32,14 +31,9 @@ rec { runScript = "appimage-exec.sh -w -d ${src}"; } // (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 // { inherit name extraPkgs; - src = extractType2 { inherit name src; }; + src = extract { inherit name src; }; }); defaultFhsEnvArgs = { |