diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-04-09 01:26:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-09 01:26:18 +0200 |
commit | 16e5a1a19ea32f18426e554da4eb5b4e00ae1aff (patch) | |
tree | bfea468d7e2ce79fa82d7969b10ce73afd1d8026 | |
parent | 4e23a0b384d5ba8baa66497385bb2ebbd43f097e (diff) | |
parent | 57739be66c7ad2f0c83c8532dd30ce9707d5f6c9 (diff) |
Merge pull request #167725 from bobby285271/nettool
gnome.gnome-nettool: 3.8.1 → 42.0
-rw-r--r-- | pkgs/desktops/gnome/apps/gnome-nettool/default.nix | 72 |
1 files changed, 61 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome/apps/gnome-nettool/default.nix index ca75b7aae07f4..b738aa87666f6 100644 --- a/pkgs/desktops/gnome/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-nettool/default.nix @@ -1,28 +1,78 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook -, libgtop, intltool, itstool, libxml2, nmap, inetutils }: +{ stdenv +, lib +, fetchurl +, fetchpatch +, desktop-file-utils +, itstool +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +, glib +, gtk3 +, libgtop +, dnsutils +, iputils +, nmap +, inetutils +, gnome +}: stdenv.mkDerivation rec { pname = "gnome-nettool"; - version = "3.8.1"; + version = "42.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "pU8p7vIDiu5pVRyLGcpPdY5eueIJCkvGtWM9/wGIdR8="; }; - nativeBuildInputs = [ pkg-config ]; + patches = [ + # Fix build with meson 0.61 + # https://gitlab.gnome.org/GNOME/gnome-nettool/-/merge_requests/3 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-nettool/-/commit/1124c3e1fdb8472d30b7636500229aa16cdc1244.patch"; + sha256 = "fbpfL8Xb1GsadpQzAdmu8FSPs++bsGCVdcwnzQWttGY="; + }) + ]; + + nativeBuildInputs = [ + desktop-file-utils + itstool + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + buildInputs = [ - gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome.adwaita-icon-theme + glib + gtk3 + libgtop ]; - propagatedUserEnvPkgs = [ nmap inetutils ]; + postPatch = '' + chmod +x postinstall.py + patchShebangs postinstall.py + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ + dnsutils # for dig + iputils # for ping + nmap # for nmap + inetutils # for ping6, traceroute, whois + ]}" + ) + ''; passthru = { updateScript = gnome.updateScript { packageName = pname; attrPath = "gnome.${pname}"; - versionPolicy = "none"; }; }; @@ -30,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool"; description = "A collection of networking tools"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } |