Unverified Commit 659e1aa4 authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge libhttpseverywhere: remove (#399445)

parents c9ae2c79 48ae7836
Loading
Loading
Loading
Loading
+0 −87
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchurl,
  pkg-config,
  meson,
  ninja,
  makeFontsConf,
  vala,
  fetchpatch,
  gnome,
  libgee,
  glib,
  json-glib,
  libarchive,
  libsoup_2_4,
  gobject-introspection,
}:

let
  pname = "libhttpseverywhere";
  version = "0.8.3";
in
stdenv.mkDerivation rec {
  name = "${pname}-${version}";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
    sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
  };

  nativeBuildInputs = [
    vala
    gobject-introspection
    meson
    ninja
    pkg-config
  ];
  buildInputs = [
    glib
    libgee
    json-glib
    libsoup_2_4
    libarchive
  ];

  patches = [
    # Fixes build with vala >=0.42
    (fetchpatch {
      url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch";
      sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f";
    })
    # fix build with meson 0.60
    (fetchpatch {
      url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/-/commit/4c38b2ca25802c464f3204a62815201d8cf549fd.patch";
      sha256 = "sha256-1+fmR0bpvJ9ISN2Hr+BTIQz+Bf6VfY1RdVZ/OohUlWU=";
    })
  ];

  mesonFlags = [ "-Denable_valadoc=true" ];

  doCheck = true;

  checkPhase = "(cd test && ./httpseverywhere_test)";

  FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };

  outputs = [
    "out"
    "devdoc"
  ];

  passthru = {
    updateScript = gnome.updateScript {
      packageName = pname;
      versionPolicy = "odd-unstable";
    };
  };

  meta = with lib; {
    description = "Library to use HTTPSEverywhere in desktop applications";
    homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere";
    license = licenses.lgpl3;
    platforms = platforms.linux;
    maintainers = with maintainers; [ sternenseemann ] ++ teams.gnome.members;
  };
}
+1 −0
Original line number Diff line number Diff line
@@ -934,6 +934,7 @@ mapAliases {
  libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22
  libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17
  libheimdal = heimdal; # Added 2022-11-18
  libhttpseverywhere = throw "'libhttpseverywhere' has been removed due to lack of upstream maintenance. It was no longer used in nixpkgs."; # Added 2025-04-17
  libiconv-darwin = darwin.libiconv;
  libixp_hg = libixp;
  libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17