directvnc: 0.7.5-test-051207 -> 0.7.7.2015-04-16

3 files changed, 17 insertions, 28 deletions

diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix
index a63aceedee374..b11a4d6d8f2cc 100644
--- a/pkgs/os-specific/linux/directvnc/default.nix
+++ b/pkgs/os-specific/linux/directvnc/default.nix
@@ -1,22 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, directfb, zlib, libjpeg, xproto }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xproto }:
 
 stdenv.mkDerivation rec {
-  name="directvnc-${version}";
-  version="0.7.5-test-051207";
+  name = "directvnc-${version}";
+  version = "0.7.7.2015-04-16";
 
-  src = fetchurl {
-    url = "http://directvnc-rev.googlecode.com/files/directvnc-${version}.tar.gz";
-    sha256 = "1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9";
+  src = fetchFromGitHub {
+    owner = "drinkmilk";
+    repo = "directvnc";
+    rev = "d336f586c5865da68873960092b7b5fbc9f8617a";
+    sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    directfb zlib libjpeg xproto
-  ];
-      
-  meta = {
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ directfb zlib libjpeg xproto ];
+
+  meta = with stdenv.lib; {
     description = "DirectFB VNC client";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = with stdenv.lib.platforms; linux;
+    homepage = http://drinkmilk.github.io/directvnc/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/directvnc/src-for-default.nix b/pkgs/os-specific/linux/directvnc/src-for-default.nix
deleted file mode 100644
index 1141a1133f505..0000000000000
--- a/pkgs/os-specific/linux/directvnc/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="0.7.5-test-051207";
-   name="directvnc-0.7.5-test-051207";
-   hash="1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9";
-   url="http://directvnc-rev.googlecode.com/files/directvnc-${version}.tar.gz";
-   advertisedUrl="http://directvnc-rev.googlecode.com/files/directvnc-0.7.5-test-051207.tar.gz";
-  
-  
-}
diff --git a/pkgs/os-specific/linux/directvnc/src-info-for-default.nix b/pkgs/os-specific/linux/directvnc/src-info-for-default.nix
deleted file mode 100644
index 5c3ac7171addc..0000000000000
--- a/pkgs/os-specific/linux/directvnc/src-info-for-default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  downloadPage = "http://code.google.com/p/directvnc-rev/downloads/list";
-  baseName = "directvnc";
-  versionExtractorSedScript = ''s/[^0-9]*-([0-9].*[0-9])[.].*/\1/'';
-}