public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Linux detection in libvncserver to build linuxvnc

Browse Source
This commit is contained in:
Michael Raskin 2013-10-20 17:34:42 +04:00
parent 81ef604ae0
commit 69128628af
3 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/development/libraries/libvncserver/default.nix
View File

@ -1,29 +1,38 @@
args : {stdenv, fetchurl,
libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto,
xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama,
libXrandr, randrproto, libXtst, zlib
}:
let let
lib = args.lib; s = # Generated upstream information
fetchurl = args.fetchurl; rec {
baseName="libvncserver";
version = lib.attrByPath ["version"] "0.9.9" args; version="0.9.9";
buildInputs = with args; [ name="${baseName}-${version}";
hash="1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng";
url="mirror://sourceforge/project/libvncserver/libvncserver/0.9.9/LibVNCServer-0.9.9.tar.gz";
sha256="1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng";
};
buildInputs = [
libtool libjpeg openssl libX11 libXdamage xproto damageproto libtool libjpeg openssl libX11 libXdamage xproto damageproto
xextproto libXext fixesproto libXfixes xineramaproto libXinerama xextproto libXext fixesproto libXfixes xineramaproto libXinerama
libXrandr randrproto libXtst zlib libXrandr randrproto libXtst zlib
]; ];
in in
rec { stdenv.mkDerivation {
src = fetchurl { inherit (s) name version;
url = "mirror://sourceforge/libvncserver/LibVNCServer-${version}.tar.gz";
sha256 = "1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng";
};
inherit buildInputs; inherit buildInputs;
configureFlags = []; src = fetchurl {
inherit (s) url sha256;
/* doConfigure should be specified separately */ };
phaseNames = ["doConfigure" "doMakeInstall"]; preConfigure = ''
sed -e 's@/usr/include/linux@${stdenv.gcc.libc}/include/linux@g' -i configure
name = "libvncserver-" + version; '';
meta = { meta = {
inherit (s) version;
description = "VNC server library"; description = "VNC server library";
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
}; };
} }

4
pkgs/development/libraries/libvncserver/default.upstream Normal file
View File

@ -0,0 +1,4 @@
url http://sourceforge.net/projects/libvncserver/files/libvncserver/
SF_version_dir
version_link '[.]tar[.][bgx]z[0-9]*/download$'
SF_redirect

7
pkgs/top-level/all-packages.nix
View File

@ -5058,12 +5058,7 @@ let
libvisual = callPackage ../development/libraries/libvisual { }; libvisual = callPackage ../development/libraries/libvisual { };
libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) { libvncserver = callPackage ../development/libraries/libvncserver {};
inherit libtool libjpeg openssl zlib;
inherit (xlibs) xproto libX11 damageproto libXdamage
libXext xextproto fixesproto libXfixes xineramaproto
libXinerama libXrandr randrproto libXtst;
};
libviper = callPackage ../development/libraries/libviper { }; libviper = callPackage ../development/libraries/libviper { };