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/video | |
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/video')
-rw-r--r-- | pkgs/applications/video/lbry/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/losslesscut-bin/build-from-appimage.nix | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix index c3eb942fed929..f978fd6226060 100644 --- a/pkgs/applications/video/lbry/default.nix +++ b/pkgs/applications/video/lbry/default.nix @@ -15,9 +15,7 @@ appimageTools.wrapAppImage rec { }; # At runtime, Lbry likes to have access to Ffmpeg - extraPkgs = pkgs: with pkgs; [ - ffmpeg - ]; + extraPkgs = pkgs: [ pkgs.ffmpeg ]; # General fixup extraInstallCommands = '' diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index 1317536f3cf55..14e4cf215e7bc 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -29,8 +29,6 @@ appimageTools.wrapType2 { export LC_ALL=C.UTF-8 ''; - extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps; - extraInstallCommands = '' ( mkdir -p $out/share |