Merge remote-tracking branch 'orange/master'

1 files changed, 0 insertions, 40 deletions

diff --git a/makefu/5pkgs/novnc/default.nix b/makefu/5pkgs/novnc/default.nix
deleted file mode 100644
index b3b5ed0d4..000000000
--- a/makefu/5pkgs/novnc/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, lib, fetchurl, pkgs }:
-# source: https://github.com/hyphon81/Nixtack/blob/master/noVNC/noVNC.nix
-let
-in
-
-stdenv.mkDerivation rec {
-  name = "novnc-${version}";
-  version = "0.6.2";
-
-  src = fetchurl {
-    url = "https://github.com/novnc/noVNC/archive/v${version}.tar.gz";
-    sha256 = "16ygbdzdmnfg9a26d9il4a6fr16qmq0ix9imfbpzl0drfbj7z8kh";
-  };
-  p = lib.makeBinPath [ pkgs.nettools pkgs.python27Packages.websockify
-                               pkgs.coreutils pkgs.which pkgs.procps ];
-  patchPhase = ''
-    sed -i '1aset -efu\nexport PATH=${p}\n' utils/launch.sh
-  '';
-  installPhase = ''
-    mkdir -p $out/bin
-    cp utils/launch.sh $out/bin/launch-novnc.sh
-    chmod +x $out/bin/launch-novnc.sh
-    mkdir -p $out/images
-    cp -r images/* $out/images/
-    mkdir -p $out/include
-    cp -r include/* $out/include/
-    cp favicon.ico $out
-    cp vnc.html $out
-    cp vnc_auto.html $out
-  '';
-
-  meta = with lib; {
-    homepage = http://novnc.com/info.html;
-    repositories.git = git://github.com/novnc/noVNC.git;
-    description = ''
-      A HTML5 VNC Client
-    '';
-    license = licenses.mpl20;
-  };
-}