diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-09-21 10:11:23 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-09-23 20:48:27 +0800 |
| commit | 87e14a7d48c6740111094bb69d474f6eb9a1924b (patch) | |
| tree | debd05c2ab8878fb7cbb268bf1072b144f29ad80 | |
| parent | libchamplain: Format with nixpkgs-fmt (diff) | |
| download | nixpkgs-87e14a7d48c6740111094bb69d474f6eb9a1924b.tar.gz | |
libchamplain_libsoup3: init
| -rw-r--r-- | pkgs/development/libraries/libchamplain/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 119e7ec5ecca..34440d67818d 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , lib , stdenv , meson @@ -15,7 +16,9 @@ , gnome , clutter-gtk , libsoup +, libsoup_3 , gobject-introspection /*, libmemphis */ +, withLibsoup3 ? false }: stdenv.mkDerivation rec { @@ -27,6 +30,16 @@ stdenv.mkDerivation rec { sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2"; }; + patches = lib.optionals withLibsoup3 [ + # Port to libsoup3 + # https://gitlab.gnome.org/GNOME/libchamplain/-/merge_requests/13 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libchamplain/-/commit/1cbaf3193c2b38e447fbc383d4c455c3dcac6db8.patch"; + excludes = [ ".gitlab-ci.yml" ]; + sha256 = "uk38gExnUgeUKwhDsqRU77hGWhJ+8fG5dSiV2MAWLFk="; + }) + ]; + outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ @@ -42,7 +55,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite - libsoup + (if withLibsoup3 then libsoup_3 else libsoup) ]; propagatedBuildInputs = [ @@ -78,7 +91,7 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - maintainers = teams.gnome.members; + maintainers = teams.gnome.members ++ teams.pantheon.members; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b56afc49ac99..663225a1b251 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19422,6 +19422,8 @@ with pkgs; libchamplain = callPackage ../development/libraries/libchamplain { }; + libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; }; + libchardet = callPackage ../development/libraries/libchardet { }; libchewing = callPackage ../development/libraries/libchewing { }; |