diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-01-22 23:04:26 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2018-01-22 23:04:26 +0800 |
| commit | 92c0720be970dfc7b3699d84feef665182f6bf2b (patch) | |
| tree | 607cd345474ba39cd17204052f21b03e183e7ffd /pkgs/applications/audio | |
| parent | e45dfded2bc950dbc8ae8102cfbfa8019a46716f (diff) | |
| download | nixpkgs-92c0720be970dfc7b3699d84feef665182f6bf2b.tar nixpkgs-92c0720be970dfc7b3699d84feef665182f6bf2b.tar.gz nixpkgs-92c0720be970dfc7b3699d84feef665182f6bf2b.tar.bz2 nixpkgs-92c0720be970dfc7b3699d84feef665182f6bf2b.tar.lz nixpkgs-92c0720be970dfc7b3699d84feef665182f6bf2b.tar.xz nixpkgs-92c0720be970dfc7b3699d84feef665182f6bf2b.tar.zst nixpkgs-92c0720be970dfc7b3699d84feef665182f6bf2b.zip | |
cantata: fix segfault on qt 5.10
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/cantata/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 57d8b554c4f..35214502e09 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, vlc , qtbase, qtmultimedia, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that @@ -45,6 +45,15 @@ in stdenv.mkDerivation rec { sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; }; + patches = [ + # patch is needed for 2.2.0 with qt 5.10 (doesn't harm earlier versions) + (fetchpatch { + url = "https://github.com/CDrummond/cantata/commit/4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a.patch"; + sha256 = "1z21ax3542z7hm628xv110lmplaspb407jzgfk16xkphww5qyphj"; + name = "fix_qt_510.patch"; + }) + + ]; buildInputs = [ vlc qtbase qtmultimedia qtsvg ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] |