From ab3b7e2a12e7701e38d750b9ff8703eaea5afeee Mon Sep 17 00:00:00 2001 From: Evils Date: Wed, 19 May 2021 18:48:18 +0200 Subject: [PATCH 1/3] clementine: fetch patch to fix wayland execution --- pkgs/applications/audio/clementine/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 0b82bbd8d84..88d82afa624 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -22,6 +22,12 @@ 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 ]; From 54ce28e88b0a96e4b1c1e2ea79d8fdf472704b7b Mon Sep 17 00:00:00 2001 From: Evils Date: Wed, 5 May 2021 17:19:59 +0200 Subject: [PATCH 2/3] clementine: nixpkgs-fmt --- .../applications/audio/clementine/default.nix | 59 +++++++++++++++---- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 88d82afa624..e58a8c2a625 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,8 +1,40 @@ -{ 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 +}: let withIpod = config.clementine.ipod or false; @@ -30,7 +62,11 @@ let }) ]; - nativeBuildInputs = [ cmake pkg-config makeWrapper ]; + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; buildInputs = [ boost @@ -55,10 +91,10 @@ let sqlite taglib ] - ++ 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 \ @@ -138,4 +174,5 @@ let }; }; -in free +in +free From 13186d181068a16d08944292f877219975aa3b98 Mon Sep 17 00:00:00 2001 From: Evils Date: Wed, 5 May 2021 17:20:19 +0200 Subject: [PATCH 3/3] clementine: add stuff not found by config --- pkgs/applications/audio/clementine/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index e58a8c2a625..4184f0eea8c 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -34,6 +34,15 @@ , config , makeWrapper , gst_plugins + +, util-linux +, libunwind +, libselinux +, elfutils +, libsepol +, orc + +, alsaLib }: let @@ -66,6 +75,13 @@ let cmake pkg-config makeWrapper + + util-linux + libunwind + libselinux + elfutils + libsepol + orc ]; buildInputs = [ @@ -90,6 +106,8 @@ let qttools sqlite taglib + + alsaLib ] ++ lib.optionals (withIpod) [ libgpod libplist usbmuxd ] ++ lib.optionals (withMTP) [ libmtp ]