appimage: avoid setting name
This commit is contained in:
parent
90622c10bd
commit
340d601e84
|
@ -490,6 +490,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||||
|
|
||||||
- The initrd ssh daemon module got a new option to add authorized keys via a list of files using `boot.initrd.network.ssh.authorizedKeyFiles`.
|
- The initrd ssh daemon module got a new option to add authorized keys via a list of files using `boot.initrd.network.ssh.authorizedKeyFiles`.
|
||||||
|
|
||||||
|
- `appimage`, `appimageTools.wrapAppImage` and `buildFHSEnvBubblewrap` now properly accepts `pname` and `version`.
|
||||||
|
|
||||||
- Programs written in [Nim](https://nim-lang.org/) are built with libraries selected by lockfiles.
|
- Programs written in [Nim](https://nim-lang.org/) are built with libraries selected by lockfiles.
|
||||||
The `nimPackages` and `nim2Packages` sets have been removed.
|
The `nimPackages` and `nim2Packages` sets have been removed.
|
||||||
See https://nixos.org/manual/nixpkgs/unstable#nim for more information.
|
See https://nixos.org/manual/nixpkgs/unstable#nim for more information.
|
||||||
|
|
|
@ -39,15 +39,12 @@ rec {
|
||||||
wrapType1 = wrapType2;
|
wrapType1 = wrapType2;
|
||||||
|
|
||||||
wrapAppImage = args@{
|
wrapAppImage = args@{
|
||||||
name ? "${args.pname}-${args.version}",
|
|
||||||
src,
|
src,
|
||||||
extraPkgs,
|
extraPkgs,
|
||||||
meta ? {},
|
meta ? {},
|
||||||
...
|
...
|
||||||
}: buildFHSEnv
|
}: buildFHSEnv
|
||||||
(defaultFhsEnvArgs // {
|
(defaultFhsEnvArgs // {
|
||||||
inherit name;
|
|
||||||
|
|
||||||
targetPkgs = pkgs: [ appimage-exec ]
|
targetPkgs = pkgs: [ appimage-exec ]
|
||||||
++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
|
++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
|
||||||
|
|
||||||
|
@ -58,10 +55,10 @@ rec {
|
||||||
} // meta;
|
} // meta;
|
||||||
} // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
|
} // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
|
||||||
|
|
||||||
wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage
|
wrapType2 = args@{ src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage
|
||||||
(args // {
|
(args // {
|
||||||
inherit name extraPkgs;
|
inherit extraPkgs;
|
||||||
src = extract { inherit name src; };
|
src = extract (lib.filterAttrs (key: value: builtins.elem key [ "name" "pname" "version" "src" ]) args);
|
||||||
|
|
||||||
# passthru src to make nix-update work
|
# passthru src to make nix-update work
|
||||||
# hack to keep the origin position (unsafeGetAttrPos)
|
# hack to keep the origin position (unsafeGetAttrPos)
|
||||||
|
@ -73,8 +70,6 @@ rec {
|
||||||
});
|
});
|
||||||
|
|
||||||
defaultFhsEnvArgs = {
|
defaultFhsEnvArgs = {
|
||||||
name = "appimage-env";
|
|
||||||
|
|
||||||
# Most of the packages were taken from the Steam chroot
|
# Most of the packages were taken from the Steam chroot
|
||||||
targetPkgs = pkgs: with pkgs; [
|
targetPkgs = pkgs: with pkgs; [
|
||||||
gtk3
|
gtk3
|
||||||
|
|
Loading…
Reference in New Issue
Block a user