about summary refs log tree commit diff
path: root/pkgs/by-name/no
diff options
context:
space:
mode:
authorMartino Fontana <tinozzo123@gmail.com>2024-05-01 14:42:20 +0200
committerMartino Fontana <tinozzo123@gmail.com>2024-05-13 20:35:07 +0200
commit6e465f4550a54414cda068d6dca8c7820a660b6b (patch)
tree4479b42acf1166948ad9d493f54a3f5f044ca497 /pkgs/by-name/no
parent1ee25e4d13221b9303bd66dafaa791f6759b24c2 (diff)
treewide: fix use of `extraPkgs` in AppImages
Mostly removes unnecessary use of `extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;`
This caused some packages to be listed twice.

Also, fix some styling, and accidental use of top-level packages (sometimes due to the `with;` keyword, e.g. on `beeper`).
Remove inclusions of `bash`, since `bashInteractive` is already present by default.
Diffstat (limited to 'pkgs/by-name/no')
-rw-r--r--pkgs/by-name/no/nosql-workbench/package.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix
index c3efc29b55c09..e3d1890665a5b 100644
--- a/pkgs/by-name/no/nosql-workbench/package.nix
+++ b/pkgs/by-name/no/nosql-workbench/package.nix
@@ -58,9 +58,9 @@ if stdenv.isDarwin then stdenv.mkDerivation {
 } else appimageTools.wrapType2 {
   inherit pname version src meta;
 
-  extraPkgs = ps: (appimageTools.defaultFhsEnvArgs.multiPkgs ps) ++ [
+  extraPkgs = pkgs: [
     # Required to run DynamoDB locally
-    ps.jdk21
+    pkgs.jdk21
   ];
 
   extraInstallCommands = let