public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cantata: 1.5.1 -> 2.0.1

Browse Source
This commit is contained in:
Jörg Thalheim 2017-02-28 17:30:26 +01:00
parent 17835f14c5
commit 6405bbe867
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/audio/cantata/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake { stdenv, fetchFromGitHub, cmake, vlc
, withQt4 ? false, qt4 , withQt4 ? false, qt4
, withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper , withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper
@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib;
assert withReplaygain -> withTaglib; assert withReplaygain -> withTaglib;
let let
version = "1.5.1"; version = "2.0.1";
pname = "cantata"; pname = "cantata";
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
fstats = x: map (fstat x); fstats = x: map (fstat x);
@ -43,14 +43,15 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchFromGitHub {
inherit name; owner = "CDrummond";
url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8"; repo = "cantata";
sha256 = "0y7y3nbiqgh1ghb47n4lfyp163wvazvhavlshb1c18ik03fkn5sp"; rev = "v${version}";
sha256 = "18fiz3cav41dpap42qwj9hwxf2k9fmhyg2r34yggxqi2cjlsil36";
}; };
buildInputs = buildInputs =
[ cmake ] [ cmake vlc ]
++ stdenv.lib.optional withQt4 qt4 ++ stdenv.lib.optional withQt4 qt4
++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ] ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ]
++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
@ -64,9 +65,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper; nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper;
unpackPhase = "tar -xvf $src";
sourceRoot = "${name}";
cmakeFlags = stdenv.lib.flatten [ cmakeFlags = stdenv.lib.flatten [
(fstat withQt5 "QT5") (fstat withQt5 "QT5")
(fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])

3
pkgs/top-level/all-packages.nix
View File

@ -1101,6 +1101,7 @@ with pkgs;
davix = callPackage ../tools/networking/davix { }; davix = callPackage ../tools/networking/davix { };
cantata = libsForQt5.callPackage ../applications/audio/cantata { cantata = libsForQt5.callPackage ../applications/audio/cantata {
inherit vlc;
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
}; };
@ -10499,7 +10500,7 @@ with pkgs;
hbase = callPackage ../servers/hbase {}; hbase = callPackage ../servers/hbase {};
hiawatha = callPackage ../servers/http/hiawatha {}; hiawatha = callPackage ../servers/http/hiawatha {};
ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
jboss = callPackage ../servers/http/jboss { }; jboss = callPackage ../servers/http/jboss { };