diff options
| -rw-r--r-- | pkgs/applications/audio/strawberry/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index b9821895d37bc..0646099973ffa 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -10,6 +10,7 @@ , fftw , gnutls , libcdio +, libebur128 , libmtp , libpthreadstubs , libtasn1 @@ -34,21 +35,23 @@ , gst_all_1 , withVlc ? true , libvlc +, nix-update-script }: let - inherit (lib) optionals; + inherit (lib) optionals optionalString; in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.21"; + version = "1.0.23"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-McwnYHaw0LYDeHLDQzfqRIYMV2FoiMdHyOL/EE8/esU="; + hash = "sha256-hzZx530HD7R3JOG6cCsoaW9puYkmu7m5lr+EfobKX7o="; + fetchSubmodules = true; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead @@ -64,6 +67,7 @@ stdenv.mkDerivation rec { fftw gnutls libcdio + libebur128 libidn2 libmtp libpthreadstubs @@ -89,7 +93,7 @@ stdenv.mkDerivation rec { gst-plugins-good gst-plugins-bad gst-plugins-ugly - ]) ++ lib.optional withVlc libvlc; + ]) ++ optionals withVlc [ libvlc ]; nativeBuildInputs = [ cmake @@ -101,13 +105,15 @@ stdenv.mkDerivation rec { util-linux ]; - postInstall = lib.optionalString withGstreamer '' + postInstall = optionalString withGstreamer '' qtWrapperArgs+=( --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" ) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Music player and music collection organizer"; homepage = "https://www.strawberrymusicplayer.org/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5840667a98f1..f27ee8b77e46b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7795,7 +7795,11 @@ with pkgs; stratis-cli = callPackage ../tools/filesystems/stratis-cli { }; - strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; + strawberry-qt5 = libsForQt5.callPackage ../applications/audio/strawberry { }; + + strawberry-qt6 = qt6Packages.callPackage ../applications/audio/strawberry { }; + + strawberry = strawberry-qt5; schleuder = callPackage ../tools/security/schleuder { }; |