From bdf89d28186096e86079552f2e7fbcdbe496480b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 10 Nov 2016 00:35:47 +0100
Subject: jzmq: 2.1.0 -> 3.1.0

---
 pkgs/development/libraries/java/jzmq/default.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'pkgs/development/libraries/java/jzmq')

diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
index d7316ba3927..eb440657278 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -1,29 +1,30 @@
-{stdenv, fetchgit, automake, autoconf, libtool, pkgconfig, zeromq2, jdk}:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }:
 
 stdenv.mkDerivation rec {
-  name = "jzmq-2.1.0";
+  name = "jzmq-${version}";
+  version = "3.1.0";
 
-  src = fetchgit {
-    url = git://github.com/zeromq/jzmq.git;
-    rev = "946fd39780423b2df6e5efd9fa2cd863fd79c9db";
-    sha256 = "08pqh673fcqwm68hmnsmzrz4vzlwr0x9hdysic5k5mh7z411xzmp";
+  src = fetchFromGitHub {
+    owner = "zeromq";
+    repo = "jzmq";
+    rev = "v${version}";
+    sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63";
   };
 
-  buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ];
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ pkgconfig zeromq3 jdk ];
 
-  preConfigurePhases = ["./autogen.sh"];
   preConfigure = ''
-    sed -i -e 's|(JAVAC)|(JAVAC) -encoding utf8|' src/Makefile.in
     ${if stdenv.system == "x86_64-darwin" then
       '' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure
       '' else ""}
   '';
 
-
-  maintainers = [ stdenv.lib.maintainers.vizanto ];
   meta = {
     homepage = "http://www.zeromq.org";
     description = "Java bindings for ZeroMQ";
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.lgpl3;
+    maintainers = [ stdenv.lib.maintainers.vizanto ];
   };
 }
-- 
cgit 1.4.1