clementine: fix build with gcc6
This commit is contained in:
parent
8991610fbc
commit
1475b0f0df
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
|
{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
|
||||||
, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
|
, 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 }:
|
, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -26,9 +26,10 @@ let
|
|||||||
./clementine-spotify-blob-remove-from-build.patch
|
./clementine-spotify-blob-remove-from-build.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake pkgconfig ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost
|
boost
|
||||||
cmake
|
|
||||||
chromaprint
|
chromaprint
|
||||||
fftw
|
fftw
|
||||||
gettext
|
gettext
|
||||||
@ -40,7 +41,7 @@ let
|
|||||||
liblastfm
|
liblastfm
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
pcre
|
pcre
|
||||||
pkgconfig
|
projectm
|
||||||
protobuf
|
protobuf
|
||||||
qca2
|
qca2
|
||||||
qjson
|
qjson
|
||||||
@ -55,7 +56,10 @@ let
|
|||||||
|
|
||||||
free = stdenv.mkDerivation {
|
free = stdenv.mkDerivation {
|
||||||
name = "clementine-free-${version}";
|
name = "clementine-free-${version}";
|
||||||
inherit patches src buildInputs;
|
inherit src patches nativeBuildInputs buildInputs;
|
||||||
|
|
||||||
|
cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed -i src/CMakeLists.txt \
|
sed -i src/CMakeLists.txt \
|
||||||
@ -76,7 +80,7 @@ let
|
|||||||
blob = stdenv.mkDerivation {
|
blob = stdenv.mkDerivation {
|
||||||
name = "clementine-blob-${version}";
|
name = "clementine-blob-${version}";
|
||||||
# Use the same patches and sources as Clementine
|
# Use the same patches and sources as Clementine
|
||||||
inherit src;
|
inherit src nativeBuildInputs;
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./clementine-spotify-blob.patch
|
./clementine-spotify-blob.patch
|
||||||
@ -114,15 +118,13 @@ runCommand "clementine-${version}"
|
|||||||
dontPatchELF = true;
|
dontPatchELF = true;
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.clementine-player.org;
|
|
||||||
description = "A multiplatform music player"
|
description = "A multiplatform music player"
|
||||||
+ " (" + (optionalString withSpotify "with Spotify, ")
|
+ " (" + (optionalString withSpotify "with Spotify, ")
|
||||||
+ "with gstreamer plugins: "
|
+ "with gstreamer plugins: "
|
||||||
+ concatStrings (intersperse ", " (map (x: x.name) gst_plugins))
|
+ concatStrings (intersperse ", " (map (x: x.name) gst_plugins))
|
||||||
+ ")";
|
+ ")";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
platforms = platforms.linux;
|
inherit (free.meta) homepage platforms maintainers;
|
||||||
maintainers = [ maintainers.ttuegel ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
''
|
''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user