Unverified Commit b4047a04 authored by Atemu's avatar Atemu Committed by GitHub
Browse files

Merge pull request #279260 from SuperSamus/multiPkgs-false-remove 

treewide: remove `multiArch=false` and wrong usage of `extraPkgs`
parents d18b3d4b 6e465f45

pkgs/applications/audio/plexamp/default.nix

+1 −4
Original line number Diff line number Diff line 
{ lib, fetchurl, appimageTools, pkgs }:

{ lib, fetchurl, appimageTools }:



let

  pname = "plexamp";
@@ -16,9 +16,6 @@ let 
in appimageTools.wrapType2 {

  inherit pname version src;



  multiArch = false; # no 32bit needed

  extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];



  extraInstallCommands = ''

    install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop

    install -m 444 -D ${appimageContents}/plexamp.png \

pkgs/applications/blockchains/mycrypto/default.nix

+2 −6
Original line number Diff line number Diff line 
{ lib, appimageTools, fetchurl, makeDesktopItem

}:

{ lib, appimageTools, fetchurl, makeDesktopItem }:



let

  pname = "MyCrypto";
@@ -24,12 +23,9 @@ let 
    categories = [ "Finance" ];

  };



in appimageTools.wrapType2 rec {

in appimageTools.wrapType2 {

  inherit pname version src;



  multiArch = false; # no p32bit needed

  extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;



  extraInstallCommands = ''

    mkdir -p $out/share

    cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons

pkgs/applications/graphics/upscayl/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ in 
  appimageTools.wrapType2 {

    inherit pname version src;



    extraPkgs = pkgs: with pkgs; [vulkan-headers vulkan-loader];

    extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ];



    extraInstallCommands = ''

      mkdir -p $out/share/{applications,pixmaps}

pkgs/applications/misc/bazecor/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ appimageTools.wrapAppImage rec { 
  # taken from

  # https://github.com/Dygmalab/Bazecor/blob/v1.3.11/src/main/utils/udev.ts#L6



  extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [

    p.glib

  ];

  extraPkgs = pkgs: [ pkgs.glib ];



  # Also expose the udev rules here, so it can be used as:

  #   services.udev.packages = [ pkgs.bazecor ];

pkgs/applications/misc/firefly-desktop/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ let 
in appimageTools.wrapType2 {

  inherit pname version src;



  extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];

  extraPkgs = pkgs: [ pkgs.libsecret ];



  extraInstallCommands = ''

    mkdir -p $out/share/applications $out/share/pixmaps