public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28634 from orivej/clementine

Browse Source 
clementine: fix build with gcc6
This commit is contained in:
Jörg Thalheim 2017-08-28 12:44:59 +01:00 committed by GitHub
commit 85b08ca048
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/audio/clementine/default.nix
View File

@ -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 ];
}; };
} }
'' ''

8
pkgs/applications/audio/projectm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, cmake { stdenv, fetchurl, fetchpatch, pkgconfig, cmake
, glew, ftgl, ttf_bitstream_vera , glew, ftgl, ttf_bitstream_vera
, withQt ? true, qt4 , withQt ? true, qt4
, withLibvisual ? false, libvisual, SDL , withLibvisual ? false, libvisual, SDL
@ -24,7 +24,13 @@ stdenv.mkDerivation {
sha256 = "1vh6jk68a0jdb6qwppb6f8cbgmhnv2ba3bcavzfd6sq06gq08cji"; 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 = '' patchPhase = ''
patch -d src/libprojectM -p1 -i "$patch_gcc6"
sed -i 's:''${LIBVISUAL_PLUGINSDIR}:''${CMAKE_INSTALL_PREFIX}/lib/libvisual-0.4:' \ sed -i 's:''${LIBVISUAL_PLUGINSDIR}:''${CMAKE_INSTALL_PREFIX}/lib/libvisual-0.4:' \
src/projectM-libvisual/CMakeLists.txt src/projectM-libvisual/CMakeLists.txt
''; '';