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

Merge pull request #36259 from dtzWill/fix/clementine-gcc7

Browse Source 
clementine: apply upstream patch to fix build w/gcc7
This commit is contained in:
Will Dietz 2018-03-03 13:18:54 -06:00 committed by GitHub
commit 1fb765d025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm { stdenv, fetchurl, fetchpatch, 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, projectm, 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 }:
@ -24,6 +24,11 @@ let
# Required so as to avoid adding libspotify as a build dependency (as it is # Required so as to avoid adding libspotify as a build dependency (as it is
# unfree and thus would prevent us from having a free package). # unfree and thus would prevent us from having a free package).
./clementine-spotify-blob-remove-from-build.patch ./clementine-spotify-blob-remove-from-build.patch
(fetchpatch {
# Fix w/gcc7
url = "https://github.com/clementine-player/Clementine/pull/5630.patch";
sha256 = "0px7xp1m4nvrncx8sga1qlxppk562wrk2qqk19iiry84nxg20mk4";
})
]; ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];