diff options
author | Timo Kaufmann <timokau@zoho.com> | 2021-05-21 16:32:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-21 16:32:59 +0200 |
commit | 7b76e495df68217b43df39748b99ad70250d88a0 (patch) | |
tree | a1f6bf9e4cec8ec203e912aabdbe827bf342d591 /pkgs/applications | |
parent | 7a2a68316ee29534f3e6c139f21370a3ce21e675 (diff) | |
parent | 13186d181068a16d08944292f877219975aa3b98 (diff) |
Merge pull request #121493 from evils/clementine
clementine: fetchpatch to fix execution on wayland; some cleanup
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/clementine/default.nix | 83 |
1 files changed, 72 insertions, 11 deletions
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 0b82bbd8d8485..4184f0eea8cb5 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -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,11 +106,13 @@ let qttools sqlite taglib + + alsaLib ] - ++ lib.optionals (withIpod) [libgpod libplist usbmuxd] - ++ lib.optionals (withMTP) [libmtp] - ++ lib.optionals (withCD) [libcdio] - ++ lib.optionals (withCloud) [sparsehash]; + ++ lib.optionals (withIpod) [ libgpod libplist usbmuxd ] + ++ lib.optionals (withMTP) [ libmtp ] + ++ lib.optionals (withCD) [ libcdio ] + ++ lib.optionals (withCloud) [ sparsehash ]; postPatch = '' sed -i src/CMakeLists.txt \ @@ -132,4 +192,5 @@ let }; }; -in free +in +free |