strawberry: 1.0.5 -> 1.0.7
This commit is contained in:
parent
e30abcd5d7
commit
784a28af40
|
@ -1,9 +1,9 @@
|
||||||
{ mkDerivation
|
{ stdenv
|
||||||
, stdenv
|
|
||||||
, lib
|
, lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, cmake
|
, cmake
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
, wrapQtAppsHook
|
||||||
, alsa-lib
|
, alsa-lib
|
||||||
, boost
|
, boost
|
||||||
, chromaprint
|
, chromaprint
|
||||||
|
@ -20,13 +20,14 @@
|
||||||
, sqlite
|
, sqlite
|
||||||
, taglib
|
, taglib
|
||||||
, libgpod
|
, libgpod
|
||||||
|
, libidn2
|
||||||
, libpulseaudio
|
, libpulseaudio
|
||||||
, libselinux
|
, libselinux
|
||||||
, libsepol
|
, libsepol
|
||||||
, p11-kit
|
, p11-kit
|
||||||
, util-linux
|
, util-linux
|
||||||
, qtbase
|
, qtbase
|
||||||
, qtx11extras
|
, qtx11extras ? null # doesn't exist in qt6
|
||||||
, qttools
|
, qttools
|
||||||
, withGstreamer ? true
|
, withGstreamer ? true
|
||||||
, glib-networking
|
, glib-networking
|
||||||
|
@ -35,15 +36,19 @@
|
||||||
, libvlc
|
, libvlc
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
let
|
||||||
|
inherit (lib) optionals;
|
||||||
|
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
pname = "strawberry";
|
pname = "strawberry";
|
||||||
version = "1.0.5";
|
version = "1.0.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jonaski";
|
owner = "jonaski";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
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
|
# 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
|
fftw
|
||||||
gnutls
|
gnutls
|
||||||
libcdio
|
libcdio
|
||||||
|
libidn2
|
||||||
libmtp
|
libmtp
|
||||||
libpthreadstubs
|
libpthreadstubs
|
||||||
libtasn1
|
libtasn1
|
||||||
|
@ -69,13 +75,13 @@ mkDerivation rec {
|
||||||
taglib
|
taglib
|
||||||
qtbase
|
qtbase
|
||||||
qtx11extras
|
qtx11extras
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
] ++ optionals stdenv.isLinux [
|
||||||
libgpod
|
libgpod
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
libselinux
|
libselinux
|
||||||
libsepol
|
libsepol
|
||||||
p11-kit
|
p11-kit
|
||||||
] ++ lib.optionals withGstreamer (with gst_all_1; [
|
] ++ optionals withGstreamer (with gst_all_1; [
|
||||||
glib-networking
|
glib-networking
|
||||||
gstreamer
|
gstreamer
|
||||||
gst-libav
|
gst-libav
|
||||||
|
@ -90,7 +96,8 @@ mkDerivation rec {
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
qttools
|
qttools
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
wrapQtAppsHook
|
||||||
|
] ++ optionals stdenv.isLinux [
|
||||||
util-linux
|
util-linux
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue