diff options
| author | jpathy <15735913+jpathy@users.noreply.github.com> | 2018-08-07 22:55:30 +0000 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-08 00:55:30 +0200 |
| commit | 07fad592c5c1ece81e472a974377b3a2f74aca33 (patch) | |
| tree | ba65948304403ffd2e7ddc05e469d6a0a26aca4d /pkgs/applications/audio/cantata/default.nix | |
| parent | 80bf2e36417a0be67c38a526b7463e380b5076ff (diff) | |
| download | nixpkgs-07fad592c5c1ece81e472a974377b3a2f74aca33.tar nixpkgs-07fad592c5c1ece81e472a974377b3a2f74aca33.tar.gz nixpkgs-07fad592c5c1ece81e472a974377b3a2f74aca33.tar.bz2 nixpkgs-07fad592c5c1ece81e472a974377b3a2f74aca33.tar.lz nixpkgs-07fad592c5c1ece81e472a974377b3a2f74aca33.tar.xz nixpkgs-07fad592c5c1ece81e472a974377b3a2f74aca33.tar.zst nixpkgs-07fad592c5c1ece81e472a974377b3a2f74aca33.zip | |
cantata: 2.2.0 -> 2.3.2 (#44514)
Removed merged patch.
Diffstat (limited to 'pkgs/applications/audio/cantata/default.nix')
| -rw-r--r-- | pkgs/applications/audio/cantata/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 35214502e09..e379072b7e7 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -28,7 +28,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "2.2.0"; + version = "2.3.2"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -42,18 +42,9 @@ in stdenv.mkDerivation rec { owner = "CDrummond"; repo = "cantata"; rev = "v${version}"; - sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; + sha256 = "11hjday5vj0wzkc8yb5wbs05jwa8mvgxswd5qvhpci0zkl975yzn"; }; - 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 ] |