Skip to content

appimageTools.wrapAppImage: default produced derivations to sourceProvenance binaryNativeCode #177308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
risicle merged 1 commit into from
Jun 20, 2022
Merged

appimageTools.wrapAppImage: default produced derivations to sourceProvenance binaryNativeCode #177308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion pkgs/build-support/appimage/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,24 @@ rec {
extractType2 = extract;
Copy link
Contributor

@kevincox kevincox Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it worth trying to do some analysis to see if there are exceptions? Or will we apply those in follow ups (if they exist)?

Copy link
Contributor Author

@risicle risicle Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm really hoping this is all just a first pass and maintainers will continually refine things. But I've left in the possibility of override so they can.

wrapType1 = wrapType2;

wrapAppImage = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs, ... }: buildFHSUserEnv
wrapAppImage = args@{
name ? "${args.pname}-${args.version}",
src,
extraPkgs,
meta ? {},
...
}: buildFHSUserEnv
(defaultFhsEnvArgs // {
inherit name;

targetPkgs = pkgs: [ appimage-exec ]
++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;

runScript = "appimage-exec.sh -w ${src} --";

meta = {
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
} // meta;
} // (removeAttrs args ([ "pname" "version" ] ++ (builtins.attrNames (builtins.functionArgs wrapAppImage)))));

wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage
Expand Down