Commit 340d601e authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt
Browse files

appimage: avoid setting `name`

parent 90622c10

nixos/doc/manual/release-notes/rl-2405.section.md

+2 −0
Original line number Diff line number Diff line
@@ -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`.



- `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.

  The `nimPackages` and `nim2Packages` sets have been removed.

  See https://nixos.org/manual/nixpkgs/unstable#nim for more information.

pkgs/build-support/appimage/default.nix

+3 −8
Original line number Diff line number Diff line
@@ -39,15 +39,12 @@ rec { 
  wrapType1 = wrapType2;



  wrapAppImage = args@{

    name ? "${args.pname}-${args.version}",

    src,

    extraPkgs,

    meta ? {},

    ...

  }: buildFHSEnv

    (defaultFhsEnvArgs // {

      inherit name;



      targetPkgs = pkgs: [ appimage-exec ]

        ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
@@ -58,10 +55,10 @@ rec { 
      } // meta;

    } // (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 // {

      inherit name extraPkgs;

      src = extract { inherit name src; };

      inherit extraPkgs;

      src = extract (lib.filterAttrs (key: value: builtins.elem key [ "name" "pname" "version" "src" ]) args);



      # passthru src to make nix-update work

      # hack to keep the origin position (unsafeGetAttrPos)
@@ -73,8 +70,6 @@ rec { 
    });



  defaultFhsEnvArgs = {

    name = "appimage-env";



    # Most of the packages were taken from the Steam chroot

    targetPkgs = pkgs: with pkgs; [

      gtk3