Unverified Commit 0886438a authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

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

appimageTools.wrapAppImage: default produced derivations to `sourceProvenance` `binaryNativeCode`
parents f33c8906 6095bc6e

pkgs/build-support/appimage/default.nix

+11 −1
Original line number Diff line number Diff line
@@ -37,7 +37,13 @@ rec { 
  extractType2 = extract;

  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;
@@ -45,6 +51,10 @@ rec { 
        ++ 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