diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-29 18:55:16 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-29 18:55:16 +0000 |
| commit | 907bb1aac65dd3acbdd2b6be831a82d051b8c5c2 (patch) | |
| tree | db10eb10d726b31601d4eaec77e74c1dcb779941 /pkgs/tools/X11/x11vnc | |
| parent | ad1c77118f74d84ea2026da237fd50cca4ee9180 (diff) | |
* ltrace: updated to 0.5.3.
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.
svn path=/nixpkgs/trunk/; revision=22814
Diffstat (limited to 'pkgs/tools/X11/x11vnc')
| -rw-r--r-- | pkgs/tools/X11/x11vnc/default.nix | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index b8587ed223f2..bc8463128353 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -1,27 +1,23 @@ -args : with args; with builderDefs; - let localDefs = builderDefs.passthru.function (rec { - src = /* put a fetchurl here */ - fetchurl { - url = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz; - sha256 = "0sfzkbqd2d94w51czci9w5j5z67amcl1gphgg6x77dyr2h46kc0a"; - }; +{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg }: - buildInputs = [libXfixes fixesproto openssl libXdamage damageproto - zlib libX11 xproto libjpeg libXtst libXinerama xineramaproto - libXrandr randrproto libXext xextproto inputproto recordproto libXi - libXrender renderproto]; - configureFlags = []; - }); - in with localDefs; stdenv.mkDerivation rec { - name = "x11vnc-0.9.3"; - builder = writeScript (name + "-builder") - (textClosure localDefs - [doConfigure doMakeInstall doForceShare doPropagate]); + name = "x11vnc-0.9.10"; + + src = fetchurl { + url = "mirror://sourceforge/libvncserver/${name}.tar.gz"; + sha256 = "04g0da04g4iw0qwvn43a8vh2im4wx9rwl1w41acsbdi8b0amhlck"; + }; + + buildInputs = + [ xorg.libXfixes xorg.fixesproto openssl xorg.libXdamage + xorg.damageproto zlib xorg.libX11 xorg.xproto libjpeg + xorg.libXtst xorg.libXinerama xorg.xineramaproto xorg.libXrandr + xorg.randrproto xorg.libXext xorg.xextproto xorg.inputproto + xorg.recordproto xorg.libXi xorg.libXrender xorg.renderproto + ]; + meta = { description = "A VNC server connected to a real X11 screen"; - homepage = "http://www.karlrunge.com/x11vnc/"; - inherit src; + homepage = http://www.karlrunge.com/x11vnc/; }; } - |