diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-10-20 17:34:42 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-10-20 17:34:42 +0400 |
| commit | 69128628afa04c5e54ac6e45d08ae9cc1b1c8410 (patch) | |
| tree | 3fee674c3489724a32c5a2cc5b953b82c54792d8 /pkgs/development | |
| parent | 81ef604ae037925ae23133df140a2c38026f530a (diff) | |
| download | nixlib-69128628afa04c5e54ac6e45d08ae9cc1b1c8410.tar nixlib-69128628afa04c5e54ac6e45d08ae9cc1b1c8410.tar.gz nixlib-69128628afa04c5e54ac6e45d08ae9cc1b1c8410.tar.bz2 nixlib-69128628afa04c5e54ac6e45d08ae9cc1b1c8410.tar.lz nixlib-69128628afa04c5e54ac6e45d08ae9cc1b1c8410.tar.xz nixlib-69128628afa04c5e54ac6e45d08ae9cc1b1c8410.tar.zst nixlib-69128628afa04c5e54ac6e45d08ae9cc1b1c8410.zip | |
Fix Linux detection in libvncserver to build linuxvnc
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libvncserver/default.nix | 47 | ||||
| -rw-r--r-- | pkgs/development/libraries/libvncserver/default.upstream | 4 |
2 files changed, 32 insertions, 19 deletions
diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 7856183e5e9b..35adb4600414 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,29 +1,38 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - - version = lib.attrByPath ["version"] "0.9.9" args; - buildInputs = with args; [ +{stdenv, fetchurl, + libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, + xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, + libXrandr, randrproto, libXtst, zlib +}: +let + s = # Generated upstream information + rec { + baseName="libvncserver"; + version="0.9.9"; + 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 xextproto libXext fixesproto libXfixes xineramaproto libXinerama libXrandr randrproto libXtst zlib ]; in -rec { +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; src = fetchurl { - url = "mirror://sourceforge/libvncserver/LibVNCServer-${version}.tar.gz"; - sha256 = "1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng"; + inherit (s) url sha256; }; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - name = "libvncserver-" + version; + preConfigure = '' + sed -e 's@/usr/include/linux@${stdenv.gcc.libc}/include/linux@g' -i configure + ''; meta = { - description = "VNC server library"; + inherit (s) version; + description = "VNC server library"; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libvncserver/default.upstream b/pkgs/development/libraries/libvncserver/default.upstream new file mode 100644 index 000000000000..eae481974398 --- /dev/null +++ b/pkgs/development/libraries/libvncserver/default.upstream @@ -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 |