Merge pull request #121493 from evils/clementine
clementine: fetchpatch to fix execution on wayland; some cleanup
This commit is contained in:
commit
7b76e495df
@ -1,8 +1,49 @@
|
||||
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
|
||||
, qtbase, qtx11extras, qttools
|
||||
, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
|
||||
, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
|
||||
, qca2, pkg-config, sparsehash, config, makeWrapper, gst_plugins }:
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, boost
|
||||
, cmake
|
||||
, chromaprint
|
||||
, gettext
|
||||
, gst_all_1
|
||||
, liblastfm
|
||||
, qtbase
|
||||
, qtx11extras
|
||||
, qttools
|
||||
, taglib
|
||||
, fftw
|
||||
, glew
|
||||
, qjson
|
||||
, sqlite
|
||||
, libgpod
|
||||
, libplist
|
||||
, usbmuxd
|
||||
, libmtp
|
||||
, libpulseaudio
|
||||
, gvfs
|
||||
, libcdio
|
||||
, libechonest
|
||||
, libspotify
|
||||
, pcre
|
||||
, projectm
|
||||
, protobuf
|
||||
, qca2
|
||||
, pkg-config
|
||||
, sparsehash
|
||||
, config
|
||||
, makeWrapper
|
||||
, gst_plugins
|
||||
|
||||
, util-linux
|
||||
, libunwind
|
||||
, libselinux
|
||||
, elfutils
|
||||
, libsepol
|
||||
, orc
|
||||
|
||||
, alsaLib
|
||||
}:
|
||||
|
||||
let
|
||||
withIpod = config.clementine.ipod or false;
|
||||
@ -22,9 +63,26 @@ let
|
||||
|
||||
patches = [
|
||||
./clementine-spotify-blob.patch
|
||||
(fetchpatch {
|
||||
# "short-term" fix for execution on wayland (1.4.0rc1-131-g2179027a6)
|
||||
# for https://github.com/clementine-player/Clementine/issues/6587
|
||||
url = "https://github.com/clementine-player/Clementine/commit/2179027a6d97530c857e43be873baacd696ff332.patch";
|
||||
sha256 = "0344bfcyvjim5ph8w4km6zkg96rj5g9ybp9x14qgyw2gkdksimn6";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
makeWrapper
|
||||
|
||||
util-linux
|
||||
libunwind
|
||||
libselinux
|
||||
elfutils
|
||||
libsepol
|
||||
orc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
@ -48,6 +106,8 @@ let
|
||||
qttools
|
||||
sqlite
|
||||
taglib
|
||||
|
||||
alsaLib
|
||||
]
|
||||
++ lib.optionals (withIpod) [ libgpod libplist usbmuxd ]
|
||||
++ lib.optionals (withMTP) [ libmtp ]
|
||||
@ -132,4 +192,5 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
in free
|
||||
in
|
||||
free
|
||||
|
Loading…
x
Reference in New Issue
Block a user