Merge pull request #28634 from orivej/clementine

clementine: fix build with gcc6

2 files changed, 17 insertions, 9 deletions

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 5b0d285f82d9..d916b8957e62 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
 , qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
-, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, protobuf
+, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
 , qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
 
 let
@@ -26,9 +26,10 @@ let
     ./clementine-spotify-blob-remove-from-build.patch
   ];
 
+  nativeBuildInputs = [ cmake pkgconfig ];
+
   buildInputs = [
     boost
-    cmake
     chromaprint
     fftw
     gettext
@@ -40,7 +41,7 @@ let
     liblastfm
     libpulseaudio
     pcre
-    pkgconfig
+    projectm
     protobuf
     qca2
     qjson
@@ -55,7 +56,10 @@ let
 
   free = stdenv.mkDerivation {
     name = "clementine-free-${version}";
-    inherit patches src buildInputs;
+    inherit src patches nativeBuildInputs buildInputs;
+
+    cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
+
     enableParallelBuilding = true;
     postPatch = ''
       sed -i src/CMakeLists.txt \
@@ -76,7 +80,7 @@ let
   blob = stdenv.mkDerivation {
     name = "clementine-blob-${version}";
     # Use the same patches and sources as Clementine
-    inherit src;
+    inherit src nativeBuildInputs;
 
     patches = [
       ./clementine-spotify-blob.patch
@@ -114,15 +118,13 @@ runCommand "clementine-${version}"
   dontPatchELF = true;
   dontStrip = true;
   meta = {
-    homepage = http://www.clementine-player.org;
     description = "A multiplatform music player"
       + " (" + (optionalString withSpotify "with Spotify, ")
       + "with gstreamer plugins: "
       + concatStrings (intersperse ", " (map (x: x.name) gst_plugins))
       + ")";
     license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.ttuegel ];
+    inherit (free.meta) homepage platforms maintainers;
   };
 }
 ''
diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix
index 7b103286fe27..e7aace763a1b 100644
--- a/pkgs/applications/audio/projectm/default.nix
+++ b/pkgs/applications/audio/projectm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cmake
+{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake
 , glew, ftgl, ttf_bitstream_vera
 , withQt ? true, qt4
 , withLibvisual ? false, libvisual, SDL
@@ -24,7 +24,13 @@ stdenv.mkDerivation {
     sha256 = "1vh6jk68a0jdb6qwppb6f8cbgmhnv2ba3bcavzfd6sq06gq08cji";
   };
 
+  patch_gcc6 = fetchpatch {
+    url = https://raw.githubusercontent.com/gentoo/gentoo/45abd63abc6644b6e177c057b5b42d894dbf8e29/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch;
+    sha256 = "1i50scxv1jlqvb3jm3sql89a7wqckxhlpvnhz20vvmm1kii6lrsn";
+  };
+
   patchPhase = ''
+    patch -d src/libprojectM -p1 -i "$patch_gcc6"
     sed -i 's:''${LIBVISUAL_PLUGINSDIR}:''${CMAKE_INSTALL_PREFIX}/lib/libvisual-0.4:' \
       src/projectM-libvisual/CMakeLists.txt
   '';