From 58ddd8f16a6799b2463b7d27ccad36c74a93ebfe Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Mon, 21 Oct 2019 17:45:53 +0200
Subject: libechonest: 2.3.0 -> 2.3.1 (#71525)

Just a package revamp
+ one less sha1 hash in nixpkgs
---
 pkgs/development/libraries/libechonest/default.nix | 30 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix
index 855386114c1..cde046bf132 100644
--- a/pkgs/development/libraries/libechonest/default.nix
+++ b/pkgs/development/libraries/libechonest/default.nix
@@ -1,20 +1,36 @@
-{ stdenv, fetchurl, cmake, qt4, qjson, doxygen, boost }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }:
 
 stdenv.mkDerivation rec {
   pname = "libechonest";
-  version = "2.3.0";
+  version = "2.3.1";
 
-  src = fetchurl {
-    url = "http://files.lfranchi.com/${pname}-${version}.tar.bz2";
-    sha1 = "cf1b279c96f15c87c36fdeb23b569a60cdfb01db";
+  src = fetchFromGitHub {
+    owner = "lfranchi";
+    repo = pname;
+    rev = version;
+    sha256 = "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq";
   };
 
-  buildInputs = [ cmake qt4 qjson doxygen boost ];
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/lfranchi/libechonest/commit/009514f65044823ef29045397d4b58dd04d09977.patch";
+      sha256 = "0dmmpi7hixdngwiv045ilqrzyzkf56xpfyihcsx5i3xya2m0mynx";
+    })
+    (fetchpatch {
+      url = "https://github.com/lfranchi/libechonest/commit/3ce779536d56a163656e8098913f923e6cda2b5c.patch";
+      sha256 = "1vasd3sgqah562vxk71jibyws5cbihjjfnffd50qvdm2xqgvbx94";
+    })
+  ];
+
+  nativeBuildInputs = [ cmake doxygen ];
+  buildInputs = [ qt4 qjson ];
+
   enableParallelBuilding = true;
+  doCheck = false; # requires network access
 
   meta = {
     description = "A C++/Qt wrapper around the Echo Nest API";
-    homepage = http://projects.kde.org/projects/playground/libs/libechonest;
+    homepage = "https://projects.kde.org/projects/playground/libs/libechonest";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
-- 
cgit 1.4.1