diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-08-22 23:00:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-22 23:00:03 +0200 |
| commit | 4bfb26b33f82dbe9af7ef96ea3ddef032b8b22d4 (patch) | |
| tree | 0fd21e93f2b92abf6b80150f8f26d3d51d2fce39 /pkgs/tools/admin | |
| parent | a35ea3cc0c297fc00e36e4c3ee0df78eaa9d8b18 (diff) | |
| parent | d63ebd4119a4a3617b12f0541eb93f436a2bfd28 (diff) | |
Merge pull request #67255 from jtojnar/gtk-vnc-1.0
gtk-vnc: 0.9.0 → 1.0.0
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/gtk-vnc/default.nix | 64 |
1 files changed, 47 insertions, 17 deletions
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index ec31d3ebbe9..2201020c159 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,29 +1,59 @@ -{ stdenv, fetchurl, gobject-introspection -, gnutls, cairo, libtool, glib, pkgconfig -, cyrus_sasl, intltool, libpulseaudio -, libgcrypt, gtk3, vala, gnome3 -, python3 }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, gobject-introspection +, gnutls +, cairo +, glib +, pkgconfig +, cyrus_sasl +, libpulseaudio +, libgcrypt +, gtk3 +, vala +, gettext +, perl +, gnome3 +}: stdenv.mkDerivation rec { - name = "gtk-vnc-${version}"; - version = "0.9.0"; + pname = "gtk-vnc"; + version = "1.0.0"; outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1dya1wc9vis8h0fv625pii1n70cckf1xjg1m2hndz989d118i6is"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8"; }; - nativeBuildInputs = [ - python3 pkgconfig intltool libtool gobject-introspection vala + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk-vnc/commit/8588bc1c8321152ddc5086ca9b2c03a7f511e0d0.patch"; + sha256 = "0i1iapsbngl1mhnz22dd73mnzk68qc4n51pqdhnm18zqc8pawvh4"; + }) ]; - buildInputs = [ - gnutls cairo glib libgcrypt cyrus_sasl libpulseaudio gtk3 + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gobject-introspection + vala + gettext + perl # for pod2man ]; - configureFlags = [ - "--with-examples" + buildInputs = [ + gnutls + cairo + glib + libgcrypt + cyrus_sasl + libpulseaudio + gtk3 ]; passthru = { @@ -34,9 +64,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "A GTK VNC widget"; + description = "GTK VNC widget"; homepage = https://wiki.gnome.org/Projects/gtk-vnc; - license = licenses.lgpl21; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin offline ]; platforms = platforms.linux; }; |