Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III
2015-07-13 15:11:31 -07:00
178 changed files with 2917 additions and 1932 deletions
@@ -1,15 +1,16 @@
{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }:
let version = "3.5.0.31"; in
let version = "3.5.0.32"; in
stdenv.mkDerivation {
name = "libxcomp-${version}";
src = fetchurl {
sha256 = "1hi3xrjzr37zs72djw3k7gj6mn2bsihfw1iysl8l0i85jl6sdfkd";
sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
};
meta = with stdenv.lib; {
inherit version;
description = "NX compression library";
homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
license = licenses.gpl2;