Skip to content

Commit

Permalink
strawberry: 1.1.3 -> 1.2.2
Browse files Browse the repository at this point in the history
Qt5 and VLC back-end are no longer supported. protobuf is no longer
required. Use packaged kdsingleapplication instead of building it from
submodule.
  • Loading branch information
staticssleever668 committed Nov 23, 2024
1 parent 7c4afdc commit bf543d1
Showing 1 changed file with 11 additions and 15 deletions.
26 changes: 11 additions & 15 deletions pkgs/applications/audio/strawberry/default.nix
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
{ alsa-lib, boost, chromaprint, cmake, fetchFromGitHub, fftw, glib-networking
, gnutls, gst_all_1, lib, libXdmcp, libcdio, libebur128, libgpod, libidn2
, libmtp, libpthreadstubs, libpulseaudio, libselinux, libsepol, libtasn1, libvlc
, ninja, nix-update-script, p11-kit, pcre, pkg-config, protobuf, qtbase, qttools
, qtx11extras ? null # doesn't exist in qt6
, sqlite, stdenv, taglib, util-linux, withGstreamer ? true, withVlc ? true
, wrapQtAppsHook }:
, kdsingleapplication, gnutls, gst_all_1, lib, libXdmcp, libcdio, libebur128
, libgpod, libidn2, libmtp, libpthreadstubs, libpulseaudio, libselinux, libsepol
, libtasn1, ninja, nix-update-script, p11-kit, pcre, pkg-config, qtbase, qttools
, sqlite, stdenv, taglib, util-linux, wrapQtAppsHook }:

let inherit (lib) optionals optionalString;
let inherit (lib) optionals;

in stdenv.mkDerivation rec {
pname = "strawberry";
version = "1.1.3";
version = "1.2.2";

src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
hash = "sha256-yca1BJWhSUVamqSKfvEzU3xbzdR+kwfSs0pyS08oUR0=";
fetchSubmodules = true;
hash = "sha256-X752GsP2b7rumQHzw52zI7PeE8tdM9Scgl3nHVcpO/s=";
};

# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
Expand All @@ -32,6 +29,7 @@ in stdenv.mkDerivation rec {
chromaprint
fftw
gnutls
kdsingleapplication
libXdmcp
libcdio
libebur128
Expand All @@ -40,9 +38,7 @@ in stdenv.mkDerivation rec {
libpthreadstubs
libtasn1
pcre
protobuf
qtbase
qtx11extras
sqlite
taglib
] ++ optionals stdenv.hostPlatform.isLinux [
Expand All @@ -51,20 +47,20 @@ in stdenv.mkDerivation rec {
libselinux
libsepol
p11-kit
] ++ optionals withGstreamer (with gst_all_1; [
] ++ (with gst_all_1; [
glib-networking
gst-libav
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gstreamer
]) ++ optionals withVlc [ libvlc ];
]);

nativeBuildInputs = [ cmake ninja pkg-config qttools wrapQtAppsHook ]
++ optionals stdenv.hostPlatform.isLinux [ util-linux ];

postInstall = optionalString withGstreamer ''
postInstall = ''
qtWrapperArgs+=(
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
--prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"
Expand Down

0 comments on commit bf543d1

Please sign in to comment.