strawberry: 1.0.21 -> 1.0.23

This commit is contained in:
Peter Hoeg 2024-01-23 16:21:04 +01:00
parent 1fd120c2be
commit 5fd6c33068
2 changed files with 16 additions and 6 deletions

View file

@ -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/";

View file

@ -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 { };