cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #177308 from risicle/ris-native-source-provenance-appimage

Browse source 
appimageTools.wrapAppImage: default produced derivations to `sourceProvenance` `binaryNativeCode`
This commit is contained in:
Robert Scott 2022-06-20 20:02:26 +01:00 committed by GitHub
commit 0886438a2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/build-support/appimage/default.nix
View file

@ -37,7 +37,13 @@ rec {
extractType2 = extract; extractType2 = extract;
wrapType1 = wrapType2; wrapType1 = wrapType2;
wrapAppImage = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs, ... }: buildFHSUserEnv wrapAppImage = args@{
name ? "${args.pname}-${args.version}",
src,
extraPkgs,
meta ? {},
...
}: buildFHSUserEnv
(defaultFhsEnvArgs // { (defaultFhsEnvArgs // {
inherit name; inherit name;
@ -45,6 +51,10 @@ rec {
++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
runScript = "appimage-exec.sh -w ${src} --"; runScript = "appimage-exec.sh -w ${src} --";
meta = {
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
} // meta;
} // (removeAttrs args ([ "pname" "version" ] ++ (builtins.attrNames (builtins.functionArgs wrapAppImage))))); } // (removeAttrs args ([ "pname" "version" ] ++ (builtins.attrNames (builtins.functionArgs wrapAppImage)))));
wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage