diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/tools/admin | |
parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
download | nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.zip |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r-- | pkgs/tools/admin/nxproxy/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 70e1b55984dd..42bd284e73f2 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -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 ]; + }; } |