nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-14 17:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

appimageTools: deprecate name & version

Browse Source
This commit is contained in:
Felix Buehler 2024-11-28 20:25:26 +01:00
parent 4ff9194fae
commit 0e6cb950cf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,9 @@ rec {
]; ];
}; };
extract = args@{ name ? "${args.pname}-${args.version}", postExtract ? "", src, ... }: pkgs.runCommand "${name}-extracted" { extract = args@{ pname, version, name ? null, postExtract ? "", src, ... }:
assert lib.assertMsg (name == null) "The `name` argument is deprecated. Use `pname` and `version` instead to construct the name.";
pkgs.runCommand "${pname}-${version}-extracted" {
buildInputs = [ appimage-exec ]; buildInputs = [ appimage-exec ];
} '' } ''
appimage-exec.sh -x $out ${src} appimage-exec.sh -x $out ${src}
@ -58,7 +60,7 @@ rec {
wrapType2 = args@{ src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage wrapType2 = args@{ src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage
(args // { (args // {
inherit extraPkgs; inherit extraPkgs;
src = extract (lib.filterAttrs (key: value: builtins.elem key [ "name" "pname" "version" "src" ]) args); src = extract (lib.filterAttrs (key: value: builtins.elem key [ "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)