diff options
| author | Martino Fontana <tinozzo123@gmail.com> | 2024-05-01 14:42:20 +0200 |
|---|---|---|
| committer | Martino Fontana <tinozzo123@gmail.com> | 2024-05-13 20:35:07 +0200 |
| commit | 6e465f4550a54414cda068d6dca8c7820a660b6b (patch) | |
| tree | 4479b42acf1166948ad9d493f54a3f5f044ca497 /pkgs/applications/misc/zettlr | |
| parent | 1ee25e4d13221b9303bd66dafaa791f6759b24c2 (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/applications/misc/zettlr')
| -rw-r--r-- | pkgs/applications/misc/zettlr/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/zettlr/generic.nix | 5 |
2 files changed, 4 insertions, 5 deletions
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 |