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/notable | |
| 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/notable')
| -rw-r--r-- | pkgs/applications/misc/notable/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
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 \ |