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

Merge recent 'staging' into closure-size

Browse Source 
Let's get rid of those merge conflicts.
This commit is contained in:
Vladimír Čunát
2016-02-03 16:57:19 +01:00
parent c979012631 53e0f8b1cd
commit ae74c356d9
637 changed files with 123880 additions and 83341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/admin/nxproxy/default.nix
+10 -11
View File
@@ -1,23 +1,14 @@
{ stdenv, fetchurl, autoreconfHook, libxcomp }:
let version = "3.5.0.32"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "nxproxy-${version}";
version = "3.5.0.32";
src = fetchurl {
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 proxy";
homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ libxcomp ];
nativeBuildInputs = [ autoreconfHook ];
@@ -28,4 +19,12 @@ stdenv.mkDerivation {
makeFlags = [ "exec_prefix=$(out)" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "NX compression proxy";
homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}