diff options
author | Will Dietz <w@wdtz.org> | 2018-03-03 12:53:12 -0600 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-03-03 12:53:40 -0600 |
commit | 99d9c35ffef7a38d9833d690afe6ad073a6ddea2 (patch) | |
tree | c1d5417e33be188f76d25a381f81370817a9583b /pkgs/applications/audio/clementine | |
parent | e6b8eb0280be5b271a52c606e2365cb96b7bd9f1 (diff) | |
download | nixpkgs-99d9c35ffef7a38d9833d690afe6ad073a6ddea2.tar nixpkgs-99d9c35ffef7a38d9833d690afe6ad073a6ddea2.tar.gz nixpkgs-99d9c35ffef7a38d9833d690afe6ad073a6ddea2.tar.bz2 nixpkgs-99d9c35ffef7a38d9833d690afe6ad073a6ddea2.tar.lz nixpkgs-99d9c35ffef7a38d9833d690afe6ad073a6ddea2.tar.xz nixpkgs-99d9c35ffef7a38d9833d690afe6ad073a6ddea2.tar.zst nixpkgs-99d9c35ffef7a38d9833d690afe6ad073a6ddea2.zip |
clementine: apply upstream patch to fix build w/gcc7
(adds missing includes for <functional>) Fixes #36254
Diffstat (limited to 'pkgs/applications/audio/clementine')
-rw-r--r-- | pkgs/applications/audio/clementine/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index affddd90784..92a33035c82 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -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 , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf , 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 # unfree and thus would prevent us from having a free package). ./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 ]; |