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

Merge pull request #38043 from averelld/nxlib-updates 

nx-libs updates
This commit is contained in:
Matthew Justin Bauer 2018-04-08 23:02:38 -05:00 committed by GitHub
parent 33eb77bad1 d13af8be9d
commit 22e7c83da7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/libxcomp/default.nix
View File

@ -1,19 +1,20 @@
{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng, libX11, zlib }:
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }:
stdenv.mkDerivation rec {
name = "libxcomp-${version}";
version = "3.5.0.33";
version = "3.5.99.16";
src = fetchurl {
sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74";
sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2";
url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
};
buildInputs = [ libjpeg libpng libX11 zlib ];
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
preAutoreconf = ''
cd nxcomp/
sed -i 's|/src/.libs/libXcomp.a|/src/.libs/libXcomp.la|' test/Makefile.am
'';
enableParallelBuilding = true;

9
pkgs/tools/admin/nxproxy/default.nix
View File

@ -1,19 +1,20 @@
{ stdenv, fetchurl, autoreconfHook, libxcomp }:
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxcomp }:
stdenv.mkDerivation rec {
name = "nxproxy-${version}";
version = "3.5.0.33";
version = "3.5.99.16";
src = fetchurl {
sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74";
sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2";
url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
};
buildInputs = [ libxcomp ];
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
preAutoreconf = ''
cd nxproxy/
sed -i 's|-L\$(top_srcdir)/../nxcomp/src/.libs ||' src/Makefile.am
'';
makeFlags = [ "exec_prefix=$(out)" ];