Merge pull request #279260 from SuperSamus/multiPkgs-false-remove
treewide: remove `multiArch=false` and wrong usage of `extraPkgs`
This commit is contained in:
commit
b4047a0455
@ -1,4 +1,4 @@
|
|||||||
{ lib, fetchurl, appimageTools, pkgs }:
|
{ lib, fetchurl, appimageTools }:
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "plexamp";
|
pname = "plexamp";
|
||||||
@ -16,9 +16,6 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop
|
install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop
|
||||||
install -m 444 -D ${appimageContents}/plexamp.png \
|
install -m 444 -D ${appimageContents}/plexamp.png \
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ lib, appimageTools, fetchurl, makeDesktopItem
|
{ lib, appimageTools, fetchurl, makeDesktopItem }:
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "MyCrypto";
|
pname = "MyCrypto";
|
||||||
@ -24,12 +23,9 @@ let
|
|||||||
categories = [ "Finance" ];
|
categories = [ "Finance" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
in appimageTools.wrapType2 rec {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
multiArch = false; # no p32bit needed
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mkdir -p $out/share
|
mkdir -p $out/share
|
||||||
cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons
|
cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons
|
||||||
|
@ -18,7 +18,7 @@ in
|
|||||||
appimageTools.wrapType2 {
|
appimageTools.wrapType2 {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [vulkan-headers vulkan-loader];
|
extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mkdir -p $out/share/{applications,pixmaps}
|
mkdir -p $out/share/{applications,pixmaps}
|
||||||
|
@ -28,9 +28,7 @@ appimageTools.wrapAppImage rec {
|
|||||||
# taken from
|
# taken from
|
||||||
# https://github.com/Dygmalab/Bazecor/blob/v1.3.11/src/main/utils/udev.ts#L6
|
# https://github.com/Dygmalab/Bazecor/blob/v1.3.11/src/main/utils/udev.ts#L6
|
||||||
|
|
||||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
|
extraPkgs = pkgs: [ pkgs.glib ];
|
||||||
p.glib
|
|
||||||
];
|
|
||||||
|
|
||||||
# Also expose the udev rules here, so it can be used as:
|
# Also expose the udev rules here, so it can be used as:
|
||||||
# services.udev.packages = [ pkgs.bazecor ];
|
# services.udev.packages = [ pkgs.bazecor ];
|
||||||
|
@ -12,7 +12,7 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mkdir -p $out/share/applications $out/share/pixmaps
|
mkdir -p $out/share/applications $out/share/pixmaps
|
||||||
|
@ -14,7 +14,7 @@ in
|
|||||||
appimageTools.wrapType2 {
|
appimageTools.wrapType2 {
|
||||||
inherit pname src version;
|
inherit pname src version;
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [ R zlib libusb-compat-0_1 ];
|
extraPkgs = pkgs: [ pkgs.R pkgs.zlib pkgs.libusb-compat-0_1 ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mv $out/bin/${pname} $out/bin/GoldenCheetah
|
mv $out/bin/${pname} $out/bin/GoldenCheetah
|
||||||
|
@ -49,8 +49,6 @@ let
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
source "${makeWrapper}/nix-support/setup-hook"
|
source "${makeWrapper}/nix-support/setup-hook"
|
||||||
wrapProgram $out/bin/${pname} \
|
wrapProgram $out/bin/${pname} \
|
||||||
|
@ -20,11 +20,7 @@ appimageTools.wrapType2 rec {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
extraPkgs = pkgs: [ pkgs.libsecret pkgs.xorg.libxkbfile ];
|
||||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
|
|
||||||
p.libsecret
|
|
||||||
p.xorg.libxkbfile
|
|
||||||
];
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop
|
install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop
|
||||||
|
@ -13,7 +13,7 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit name src;
|
inherit name src;
|
||||||
|
|
||||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mv $out/bin/${name} $out/bin/${pname}
|
mv $out/bin/${name} $out/bin/${pname}
|
||||||
|
@ -12,7 +12,7 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [ libsecret ];
|
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||||
|
@ -13,8 +13,6 @@ let
|
|||||||
appimageContents = appimageTools.extract {
|
appimageContents = appimageTools.extract {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
|
||||||
in
|
in
|
||||||
appimageTools.wrapType2 rec {
|
appimageTools.wrapType2 rec {
|
||||||
|
|
||||||
@ -24,8 +22,8 @@ appimageTools.wrapType2 rec {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
extraPkgs = pkgs: [ pkgs.at-spi2-atk pkgs.at-spi2-core ];
|
||||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ];
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop
|
install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop
|
||||||
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \
|
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \
|
||||||
|
@ -48,8 +48,6 @@ let
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiPkgs = null; # no 32bit needed
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications
|
install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications
|
||||||
install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps
|
install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps
|
||||||
|
@ -22,9 +22,7 @@ in appimageTools.wrapAppImage {
|
|||||||
inherit pname version;
|
inherit pname version;
|
||||||
src = appimageContents;
|
src = appimageContents;
|
||||||
|
|
||||||
extraPkgs = { pkgs, ... }@args: [
|
extraPkgs = pkgs: [ pkgs.hidapi ];
|
||||||
pkgs.hidapi
|
|
||||||
] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
# Add desktop convencience stuff
|
# Add desktop convencience stuff
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ callPackage, texliveMedium }:
|
{ callPackage }:
|
||||||
|
|
||||||
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texliveMedium; })) {
|
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||||
zettlr = {
|
zettlr = {
|
||||||
version = "3.0.2";
|
version = "3.0.2";
|
||||||
hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA=";
|
hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA=";
|
||||||
|
@ -4,8 +4,6 @@
|
|||||||
, appimageTools
|
, appimageTools
|
||||||
, lib
|
, lib
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, texliveMedium
|
|
||||||
, pandoc
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||||
@ -21,8 +19,8 @@ in
|
|||||||
appimageTools.wrapType2 rec {
|
appimageTools.wrapType2 rec {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
extraPkgs = pkgs: [ pkgs.texliveMedium pkgs.pandoc ];
|
||||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ];
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
|
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
|
||||||
install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png
|
install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png
|
||||||
|
@ -17,9 +17,6 @@ appimageTools.wrapType2 rec {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Sylk WebRTC client";
|
description = "Sylk WebRTC client";
|
||||||
homepage = "https://sylkserver.com/";
|
homepage = "https://sylkserver.com/";
|
||||||
|
@ -16,8 +16,7 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname src version;
|
inherit pname src version;
|
||||||
|
|
||||||
multiArch = false;
|
extraPkgs = pkgs: [ pkgs.bash ];
|
||||||
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, pname, version, src, meta, appimageTools, makeWrapper, nss_latest }:
|
{ pname, version, src, meta, appimageTools, makeWrapper }:
|
||||||
let
|
let
|
||||||
|
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
@ -25,5 +25,5 @@ appimageTools.wrapType2 {
|
|||||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraPkgs = _: [ nss_latest ];
|
extraPkgs = pkgs: [ pkgs.nss_latest ];
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
, stdenvNoCC
|
, stdenvNoCC
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, appimageTools
|
, appimageTools
|
||||||
, libsecret
|
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, writeShellApplication
|
, writeShellApplication
|
||||||
, curl
|
, curl
|
||||||
@ -19,7 +18,7 @@ let
|
|||||||
};
|
};
|
||||||
appimage = appimageTools.wrapType2 {
|
appimage = appimageTools.wrapType2 {
|
||||||
inherit version pname src;
|
inherit version pname src;
|
||||||
extraPkgs = pkgs: with pkgs; [ libsecret ];
|
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||||
};
|
};
|
||||||
appimageContents = appimageTools.extractType2 {
|
appimageContents = appimageTools.extractType2 {
|
||||||
inherit version pname src;
|
inherit version pname src;
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ lib
|
{ fetchurl
|
||||||
, fetchurl
|
|
||||||
, appimageTools
|
, appimageTools
|
||||||
, xorg
|
, xorg
|
||||||
, pname
|
, pname
|
||||||
@ -27,8 +26,6 @@ in
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mkdir -p $out/share
|
mkdir -p $out/share
|
||||||
"${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share"
|
"${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share"
|
||||||
|
@ -30,7 +30,7 @@ appimageTools.wrapType2 {
|
|||||||
install -Dm644 ${desktopItem}/share/applications/* $out/share/applications
|
install -Dm644 ${desktopItem}/share/applications/* $out/share/applications
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [ procps ];
|
extraPkgs = pkgs: [ pkgs.procps ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Workspace Simplifier - a cross-platform application organizing web services into Workspaces similar to browser profiles";
|
description = "Workspace Simplifier - a cross-platform application organizing web services into Workspaces similar to browser profiles";
|
||||||
|
@ -16,7 +16,7 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [ at-spi2-core ];
|
extraPkgs = pkgs: [ pkgs.at-spi2-core ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop
|
install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ appimageTools, lib, fetchurl, libsecret }:
|
{ appimageTools, lib, fetchurl }:
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "electron-mail";
|
pname = "electron-mail";
|
||||||
@ -20,9 +20,9 @@ in appimageTools.wrapType2 {
|
|||||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [
|
extraPkgs = pkgs: [
|
||||||
libsecret
|
pkgs.libsecret
|
||||||
libappindicator-gtk3
|
pkgs.libappindicator-gtk3
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -12,7 +12,7 @@ appimageTools.wrapType2 rec {
|
|||||||
hash = "sha256-D7qWwIFuCJmBvfdgf4Dsd2/jvi39tbAttaHOwLND4DY=";
|
hash = "sha256-D7qWwIFuCJmBvfdgf4Dsd2/jvi39tbAttaHOwLND4DY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||||
|
|
||||||
extraInstallCommands =
|
extraInstallCommands =
|
||||||
let appimageContents = appimageTools.extract { inherit pname version src; };
|
let appimageContents = appimageTools.extract { inherit pname version src; };
|
||||||
|
@ -19,8 +19,6 @@ in appimageTools.wrapType2 rec {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false;
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop
|
install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop
|
||||||
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \
|
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, appimageTools
|
, appimageTools
|
||||||
, libsecret
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -19,9 +18,7 @@ let
|
|||||||
in appimageTools.wrapType2 rec {
|
in appimageTools.wrapType2 rec {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [
|
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||||
libsecret
|
|
||||||
];
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop
|
install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop
|
||||||
|
@ -31,8 +31,6 @@ in appimageTools.wrapType2 rec {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mkdir "$out/share"
|
mkdir "$out/share"
|
||||||
ln -s "${desktopItem}/share/applications" "$out/share/"
|
ln -s "${desktopItem}/share/applications" "$out/share/"
|
||||||
|
@ -15,9 +15,7 @@ appimageTools.wrapAppImage rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
# At runtime, Lbry likes to have access to Ffmpeg
|
# At runtime, Lbry likes to have access to Ffmpeg
|
||||||
extraPkgs = pkgs: with pkgs; [
|
extraPkgs = pkgs: [ pkgs.ffmpeg ];
|
||||||
ffmpeg
|
|
||||||
];
|
|
||||||
|
|
||||||
# General fixup
|
# General fixup
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
|
@ -29,8 +29,6 @@ appimageTools.wrapType2 {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps;
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
(
|
(
|
||||||
mkdir -p $out/share
|
mkdir -p $out/share
|
||||||
|
@ -40,7 +40,7 @@ rec {
|
|||||||
|
|
||||||
wrapAppImage = args@{
|
wrapAppImage = args@{
|
||||||
src,
|
src,
|
||||||
extraPkgs,
|
extraPkgs ? pkgs: [ ],
|
||||||
meta ? {},
|
meta ? {},
|
||||||
...
|
...
|
||||||
}: buildFHSEnv
|
}: buildFHSEnv
|
||||||
|
@ -13,8 +13,7 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit name src;
|
inherit name src;
|
||||||
|
|
||||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs)
|
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||||
++ [ pkgs.libsecret ];
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mv $out/bin/${name} $out/bin/${pname}
|
mv $out/bin/${name} $out/bin/${pname}
|
||||||
|
@ -23,7 +23,7 @@ appimageTools.wrapType2 {
|
|||||||
substituteInPlace $out/share/applications/${pname}.desktop --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U'
|
substituteInPlace $out/share/applications/${pname}.desktop --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [ libsecret ];
|
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Open-source electronics prototyping platform";
|
description = "Open-source electronics prototyping platform";
|
||||||
|
@ -16,7 +16,7 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname src version;
|
inherit pname src version;
|
||||||
|
|
||||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ];
|
extraPkgs = pkgs: [ pkgs.libthai ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications
|
install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications
|
||||||
|
@ -14,8 +14,7 @@ let
|
|||||||
in appimageTools.wrapType2 rec {
|
in appimageTools.wrapType2 rec {
|
||||||
inherit name pname src;
|
inherit name pname src;
|
||||||
|
|
||||||
multiArch = false;
|
extraPkgs = pkgs: [ pkgs.glib ];
|
||||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib ];
|
|
||||||
|
|
||||||
# Also expose the udev rules here, so it can be used as:
|
# Also expose the udev rules here, so it can be used as:
|
||||||
# services.udev.packages = [ pkgs.chrysalis ];
|
# services.udev.packages = [ pkgs.chrysalis ];
|
||||||
|
@ -62,9 +62,6 @@ if stdenv.isDarwin then stdenv.mkDerivation
|
|||||||
else appimageTools.wrapType2 {
|
else appimageTools.wrapType2 {
|
||||||
inherit pname version src meta;
|
inherit pname version src meta;
|
||||||
|
|
||||||
extraPkgs = pkgs:
|
|
||||||
appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
|
|
||||||
|
|
||||||
extraInstallCommands =
|
extraInstallCommands =
|
||||||
let
|
let
|
||||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||||
|
@ -35,7 +35,6 @@ let
|
|||||||
appimage = appimageTools.wrapAppImage {
|
appimage = appimageTools.wrapAppImage {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
src = appimageContents;
|
src = appimageContents;
|
||||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs);
|
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
@ -16,7 +16,7 @@ in
|
|||||||
appimageTools.wrapType2 {
|
appimageTools.wrapType2 {
|
||||||
inherit meta pname version src;
|
inherit meta pname version src;
|
||||||
|
|
||||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ];
|
extraPkgs = pkgs: [ pkgs.ocl-icd ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mkdir -p $out/share/applications
|
mkdir -p $out/share/applications
|
||||||
|
@ -31,8 +31,6 @@ in
|
|||||||
appimageTools.wrapType2 {
|
appimageTools.wrapType2 {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
extraPkgs = pkgs: [ ];
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||||
install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/1024x1024/apps/${pname}.png
|
install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/1024x1024/apps/${pname}.png
|
||||||
|
@ -58,9 +58,9 @@ if stdenv.isDarwin then stdenv.mkDerivation {
|
|||||||
} else appimageTools.wrapType2 {
|
} else appimageTools.wrapType2 {
|
||||||
inherit pname version src meta;
|
inherit pname version src meta;
|
||||||
|
|
||||||
extraPkgs = ps: (appimageTools.defaultFhsEnvArgs.multiPkgs ps) ++ [
|
extraPkgs = pkgs: [
|
||||||
# Required to run DynamoDB locally
|
# Required to run DynamoDB locally
|
||||||
ps.jdk21
|
pkgs.jdk21
|
||||||
];
|
];
|
||||||
|
|
||||||
extraInstallCommands = let
|
extraInstallCommands = let
|
||||||
|
@ -20,9 +20,7 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [
|
extraPkgs = pkgs: [ pkgs.segger-jlink ];
|
||||||
segger-jlink
|
|
||||||
];
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -Dm444 ${appimageContents}/nrfconnect.desktop -t $out/share/applications
|
install -Dm444 ${appimageContents}/nrfconnect.desktop -t $out/share/applications
|
||||||
|
@ -19,10 +19,6 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [
|
|
||||||
makeWrapper
|
|
||||||
];
|
|
||||||
|
|
||||||
extraBwrapArgs = [
|
extraBwrapArgs = [
|
||||||
"--setenv _JAVA_AWT_WM_NONREPARENTING 1"
|
"--setenv _JAVA_AWT_WM_NONREPARENTING 1"
|
||||||
];
|
];
|
||||||
|
@ -57,8 +57,7 @@ if stdenv.isDarwin then stdenv.mkDerivation
|
|||||||
else appimageTools.wrapType2 {
|
else appimageTools.wrapType2 {
|
||||||
inherit pname version src meta passthru;
|
inherit pname version src meta passthru;
|
||||||
|
|
||||||
extraPkgs = pkgs:
|
extraPkgs = pkgs: [ pkgs.libthai ];
|
||||||
(appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ];
|
|
||||||
|
|
||||||
extraInstallCommands =
|
extraInstallCommands =
|
||||||
let
|
let
|
||||||
|
@ -14,7 +14,6 @@ buildFHSEnv {
|
|||||||
pyserial
|
pyserial
|
||||||
]))
|
]))
|
||||||
]);
|
]);
|
||||||
multiArch = false;
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
${lib.optionalString withGui ''
|
${lib.optionalString withGui ''
|
||||||
|
@ -21,9 +21,6 @@ appimageTools.wrapType2 {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||||
install -m 444 -D ${appimageContents}/${pname}.png \
|
install -m 444 -D ${appimageContents}/${pname}.png \
|
||||||
|
@ -28,10 +28,7 @@ in appimageTools.wrapAppImage {
|
|||||||
inherit pname version;
|
inherit pname version;
|
||||||
src = appimageContents;
|
src = appimageContents;
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
extraPkgs = pkgs: [ pkgs.hidapi ];
|
||||||
extraPkgs = { pkgs, ... }@args: [
|
|
||||||
pkgs.hidapi
|
|
||||||
] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
# Add desktop convencience stuff
|
# Add desktop convencience stuff
|
||||||
|
@ -12,7 +12,7 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname src version;
|
inherit pname src version;
|
||||||
|
|
||||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/buttercup.desktop -t $out/share/applications
|
install -m 444 -D ${appimageContents}/buttercup.desktop -t $out/share/applications
|
||||||
|
Loading…
Reference in New Issue
Block a user