diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2017-02-28 17:30:26 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-02-28 17:45:58 +0100 |
| commit | 6405bbe8671c3a184ce09fc42c468604ec0a5fa7 (patch) | |
| tree | 461784afef0638aa6ed6e9c747e876c5f9cdff2c /pkgs/applications/audio | |
| parent | 17835f14c52acc0ec80e02eb8379ea81b1c58397 (diff) | |
| download | nixpkgs-6405bbe8671c3a184ce09fc42c468604ec0a5fa7.tar nixpkgs-6405bbe8671c3a184ce09fc42c468604ec0a5fa7.tar.gz nixpkgs-6405bbe8671c3a184ce09fc42c468604ec0a5fa7.tar.bz2 nixpkgs-6405bbe8671c3a184ce09fc42c468604ec0a5fa7.tar.lz nixpkgs-6405bbe8671c3a184ce09fc42c468604ec0a5fa7.tar.xz nixpkgs-6405bbe8671c3a184ce09fc42c468604ec0a5fa7.tar.zst nixpkgs-6405bbe8671c3a184ce09fc42c468604ec0a5fa7.zip | |
cantata: 1.5.1 -> 2.0.1
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/cantata/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 89aadf49fb8..3231e3e5301 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ stdenv, fetchFromGitHub, cmake, vlc , withQt4 ? false, qt4 , withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper @@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "1.5.1"; + version = "2.0.1"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -43,14 +43,15 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - src = fetchurl { - inherit name; - url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8"; - sha256 = "0y7y3nbiqgh1ghb47n4lfyp163wvazvhavlshb1c18ik03fkn5sp"; + src = fetchFromGitHub { + owner = "CDrummond"; + repo = "cantata"; + rev = "v${version}"; + sha256 = "18fiz3cav41dpap42qwj9hwxf2k9fmhyg2r34yggxqi2cjlsil36"; }; buildInputs = - [ cmake ] + [ cmake vlc ] ++ stdenv.lib.optional withQt4 qt4 ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] @@ -64,9 +65,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper; - unpackPhase = "tar -xvf $src"; - sourceRoot = "${name}"; - cmakeFlags = stdenv.lib.flatten [ (fstat withQt5 "QT5") (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) |