diff options
| author | Peter Hoeg <peter@hoeg.com> | 2022-07-27 11:29:23 +0800 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-07-31 04:29:40 +0000 |
| commit | fdca6b1c32f4aec0a486d60d23b8b47913a709a4 (patch) | |
| tree | 5fa79d150ac11f46d066ab91d773e4dc76e61a0e | |
| parent | python3Packages.mistune_2_0: 2.0.2 -> 2.0.4 (diff) | |
| download | nixpkgs-origin/backport-183058-to-release-22.05.tar.gz | |
strawberry: 1.0.5 -> 1.0.7origin/backport-183058-to-release-22.05
(cherry picked from commit 074740575e84302f4db27ed97f188e64ceeaf5a3)
| -rw-r--r-- | pkgs/applications/audio/strawberry/default.nix | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index fc02833207ef..b3dd4bee2143 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -1,9 +1,9 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub , cmake , pkg-config +, wrapQtAppsHook , alsa-lib , boost , chromaprint @@ -20,13 +20,14 @@ , sqlite , taglib , libgpod +, libidn2 , libpulseaudio , libselinux , libsepol , p11-kit , util-linux , qtbase -, qtx11extras +, qtx11extras ? null # doesn't exist in qt6 , qttools , withGstreamer ? true , glib-networking @@ -35,15 +36,19 @@ , libvlc }: -mkDerivation rec { +let + inherit (lib) optionals; + +in +stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-6d7oB54IPI+G5Mhkj+PdQQY93r1SBE2R06qSGIacj8Q="; + hash = "sha256-TAt/P9nykUtOoHmprFiUJnip8mAnJlvkufD0v9ZWrp4="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead @@ -59,6 +64,7 @@ mkDerivation rec { fftw gnutls libcdio + libidn2 libmtp libpthreadstubs libtasn1 @@ -69,13 +75,13 @@ mkDerivation rec { taglib qtbase qtx11extras - ] ++ lib.optionals stdenv.isLinux [ + ] ++ optionals stdenv.isLinux [ libgpod libpulseaudio libselinux libsepol p11-kit - ] ++ lib.optionals withGstreamer (with gst_all_1; [ + ] ++ optionals withGstreamer (with gst_all_1; [ glib-networking gstreamer gst-libav @@ -90,7 +96,8 @@ mkDerivation rec { ninja pkg-config qttools - ] ++ lib.optionals stdenv.isLinux [ + wrapQtAppsHook + ] ++ optionals stdenv.isLinux [ util-linux ]; |