diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/bazecor/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/firefly-desktop/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/golden-cheetah-bin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/joplin-desktop/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/misc/marktext/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/misc/mobilecoin-wallet/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/neo4j-desktop/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/notable/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/misc/notesnook/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/misc/todoist-electron/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/zettlr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/zettlr/generic.nix | 5 |
12 files changed, 13 insertions, 24 deletions
diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix index 7387bc212c649..ed1900836fccc 100644 --- a/pkgs/applications/misc/bazecor/default.nix +++ b/pkgs/applications/misc/bazecor/default.nix @@ -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 ]; diff --git a/pkgs/applications/misc/firefly-desktop/default.nix b/pkgs/applications/misc/firefly-desktop/default.nix index 41cd6c42a5b3f..0db1a801c5dac 100644 --- a/pkgs/applications/misc/firefly-desktop/default.nix +++ b/pkgs/applications/misc/firefly-desktop/default.nix @@ -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 diff --git a/pkgs/applications/misc/golden-cheetah-bin/default.nix b/pkgs/applications/misc/golden-cheetah-bin/default.nix index 308f43b7d4634..3fcd77f8f4b78 100644 --- a/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -14,7 +14,7 @@ in appimageTools.wrapType2 { 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 = '' mv $out/bin/${pname} $out/bin/GoldenCheetah diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 27abcc7cc8850..7127d83c65843 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -49,7 +49,6 @@ let export LC_ALL=C.UTF-8 ''; - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index 9c90ff735bbdd..1c6dc9657f215 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -20,10 +20,7 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ - p.libsecret - p.xorg.libxkbfile - ]; + extraPkgs = pkgs: [ pkgs.libsecret pkgs.xorg.libxkbfile ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/applications/misc/mobilecoin-wallet/default.nix index 1bde970c1e155..2b891abc64738 100644 --- a/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -13,7 +13,7 @@ let in appimageTools.wrapType2 { inherit name src; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index f01ef56e5d02c..6c1ac1ede965d 100644 --- a/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/pkgs/applications/misc/neo4j-desktop/default.nix @@ -12,7 +12,7 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: with pkgs; [ libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 784a52e1ab3f0..c8958950db9d4 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -13,8 +13,6 @@ let appimageContents = appimageTools.extract { inherit pname version src; }; - - nativeBuildInputs = [ makeWrapper ]; in appimageTools.wrapType2 rec { @@ -24,7 +22,8 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; + extraPkgs = pkgs: [ pkgs.at-spi2-atk pkgs.at-spi2-core ]; + extraInstallCommands = '' 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 \ diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 8ac48f97912ed..7742a54c6c0c5 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -48,7 +48,6 @@ let export LC_ALL=C.UTF-8 ''; - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index c4fef60cff0c6..16e266619ff44 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -22,9 +22,7 @@ in appimageTools.wrapAppImage { inherit pname version; src = appimageContents; - extraPkgs = { pkgs, ... }@args: [ - pkgs.hidapi - ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; + extraPkgs = pkgs: [ pkgs.hidapi ]; extraInstallCommands = '' # Add desktop convencience stuff diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 75e310cdffec4..593ca13f9fee2 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -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 = { version = "3.0.2"; hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA="; diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index d38011195b8a5..847d11c4f24ce 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -4,8 +4,6 @@ , appimageTools , lib , fetchurl -, texliveMedium -, pandoc }: # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. @@ -21,7 +19,8 @@ in appimageTools.wrapType2 rec { inherit pname version src; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ]; + extraPkgs = pkgs: [ pkgs.texliveMedium pkgs.pandoc ]; + extraInstallCommands = '' 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 |