From b3144ea2873cc1487a3d5e0d633df38474adcb2c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 15 Jun 2015 14:57:44 +0200
Subject: [PATCH] directvnc: reimplement using mkDerivation

---
 pkgs/os-specific/linux/directvnc/default.nix | 37 +++++++++-----------
 pkgs/top-level/all-packages.nix              |  4 ++-
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix
index b6f221b8ea4c..4c47104c5b67 100644
--- a/pkgs/os-specific/linux/directvnc/default.nix
+++ b/pkgs/os-specific/linux/directvnc/default.nix
@@ -1,26 +1,21 @@
-a @ { libjpeg, pkgconfig, zlib, directfb, xproto, ... } :
-let
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    directfb zlib libjpeg pkgconfig xproto
+{ stdenv, fetchurl, pkgconfig, directfb, zlib, libjpeg, xproto }:
+
+stdenv.mkDerivation rec {
+  name="directvnc-${version}";
+  version="0.7.5-test-051207";
+
+  src = fetchurl {
+    url = "http://directvnc-rev.googlecode.com/files/directvnc-${version}.tar.gz";
+    sha256 = "1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9";
+  };
+
+  buildInputs = [
+    pkgconfig directfb zlib libjpeg xproto
   ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-
+      
   meta = {
     description = "DirectFB VNC client";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 337959e3141c..9dedd8c3bd5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9742,7 +9742,9 @@ let
 
   dietlibc = callPackage ../os-specific/linux/dietlibc { };
 
-  directvnc = builderDefsPackage (callPackage ../os-specific/linux/directvnc) {};
+  directvnc = callPackage ../os-specific/linux/directvnc {
+    inherit (xlibs) xproto;
+  };
 
   dmraid = callPackage ../os-specific/linux/dmraid {
     devicemapper = devicemapper.override {enable_dmeventd = true;};