git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #121493 from evils/clementine

clementine: fetchpatch to fix execution on wayland; some cleanup

commit7b76e495df68217b43df39748b99ad70250d88a0 authorTimo Kaufmann <timokau@zoho.com> dateFri 21 May 2021, 16:32 (5 years ago) parent7a2a68313186d1
1 file changed+72−11
pkgs/applications/audio/clementine/default.nix+72−11
pkgs/applications/audio/clementine/default.nix+72−11
@@ -1,8 +1,49 @@
1−{ lib, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
2−, qtbase, qtx11extras, qttools
3−, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
4−, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
5−, qca2, pkg-config, sparsehash, config, makeWrapper, gst_plugins }:
1+{ lib
2+, mkDerivation
3+, fetchFromGitHub
4+, fetchpatch
5+, boost
6+, cmake
7+, chromaprint
8+, gettext
9+, gst_all_1
10+, liblastfm
11+, qtbase
12+, qtx11extras
13+, qttools
14+, taglib
15+, fftw
16+, glew
17+, qjson
18+, sqlite
19+, libgpod
20+, libplist
21+, usbmuxd
22+, libmtp
23+, libpulseaudio
24+, gvfs
25+, libcdio
26+, libechonest
27+, libspotify
28+, pcre
29+, projectm
30+, protobuf
31+, qca2
32+, pkg-config
33+, sparsehash
34+, config
35+, makeWrapper
36+, gst_plugins
37+
38+, util-linux
39+, libunwind
40+, libselinux
41+, elfutils
42+, libsepol
43+, orc
44+
45+, alsaLib
46+}:
647
748let
849 withIpod = config.clementine.ipod or false;
@@ -22,9 +63,26 @@ let
2263
2364 patches = [
2465 ./clementine-spotify-blob.patch
66+ (fetchpatch {
67+ # "short-term" fix for execution on wayland (1.4.0rc1-131-g2179027a6)
68+ # for https://github.com/clementine-player/Clementine/issues/6587
69+ url = "https://github.com/clementine-player/Clementine/commit/2179027a6d97530c857e43be873baacd696ff332.patch";
70+ sha256 = "0344bfcyvjim5ph8w4km6zkg96rj5g9ybp9x14qgyw2gkdksimn6";
71+ })
2572 ];
2673
27− nativeBuildInputs = [ cmake pkg-config makeWrapper ];
74+ nativeBuildInputs = [
75+ cmake
76+ pkg-config
77+ makeWrapper
78+
79+ util-linux
80+ libunwind
81+ libselinux
82+ elfutils
83+ libsepol
84+ orc
85+ ];
2886
2987 buildInputs = [
3088 boost
@@ -48,11 +106,13 @@ let
48106 qttools
49107 sqlite
50108 taglib
109+
110+ alsaLib
51111 ]
52− ++ lib.optionals (withIpod) [libgpod libplist usbmuxd]
53− ++ lib.optionals (withMTP) [libmtp]
54− ++ lib.optionals (withCD) [libcdio]
55− ++ lib.optionals (withCloud) [sparsehash];
112+ ++ lib.optionals (withIpod) [ libgpod libplist usbmuxd ]
113+ ++ lib.optionals (withMTP) [ libmtp ]
114+ ++ lib.optionals (withCD) [ libcdio ]
115+ ++ lib.optionals (withCloud) [ sparsehash ];
56116
57117 postPatch = ''
58118 sed -i src/CMakeLists.txt \
@@ -132,4 +192,5 @@ let
132192 };
133193 };
134194
135−in free
195+in
196+free