diff options
| author | Will Dietz <github@wdtz.org> | 2018-03-03 13:18:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-03 13:18:54 -0600 |
| commit | 1fb765d025021112e94d99fd665b98e41066fb6b (patch) | |
| tree | 9adfba8f60b8d4fc595c88116ec21278fef023ba | |
| parent | 33c5d78300b91045a5786fa7b55e0e1d4e905a8c (diff) | |
| parent | 99d9c35ffef7a38d9833d690afe6ad073a6ddea2 (diff) | |
| download | nixlib-1fb765d025021112e94d99fd665b98e41066fb6b.tar nixlib-1fb765d025021112e94d99fd665b98e41066fb6b.tar.gz nixlib-1fb765d025021112e94d99fd665b98e41066fb6b.tar.bz2 nixlib-1fb765d025021112e94d99fd665b98e41066fb6b.tar.lz nixlib-1fb765d025021112e94d99fd665b98e41066fb6b.tar.xz nixlib-1fb765d025021112e94d99fd665b98e41066fb6b.tar.zst nixlib-1fb765d025021112e94d99fd665b98e41066fb6b.zip | |
Merge pull request #36259 from dtzWill/fix/clementine-gcc7
clementine: apply upstream patch to fix build w/gcc7
| -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 affddd90784c..92a33035c827 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 ]; |