nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

libchamplain_libsoup3: init

authored by

Bobby Rong and committed by
Jan Tojnar
5364f7c7 8499247e

+17 -2
+15 -2
pkgs/development/libraries/libchamplain/default.nix
··· 1 1 { fetchurl 2 + , fetchpatch 2 3 , lib 3 4 , stdenv 4 5 , meson ··· 16 15 , gnome 17 16 , clutter-gtk 18 17 , libsoup 18 + , libsoup_3 19 19 , gobject-introspection /*, libmemphis */ 20 + , withLibsoup3 ? false 20 21 }: 21 22 22 23 stdenv.mkDerivation rec { ··· 29 26 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 30 27 sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2"; 31 28 }; 29 + 30 + patches = lib.optionals withLibsoup3 [ 31 + # Port to libsoup3 32 + # https://gitlab.gnome.org/GNOME/libchamplain/-/merge_requests/13 33 + (fetchpatch { 34 + url = "https://gitlab.gnome.org/GNOME/libchamplain/-/commit/1cbaf3193c2b38e447fbc383d4c455c3dcac6db8.patch"; 35 + excludes = [ ".gitlab-ci.yml" ]; 36 + sha256 = "uk38gExnUgeUKwhDsqRU77hGWhJ+8fG5dSiV2MAWLFk="; 37 + }) 38 + ]; 32 39 33 40 outputs = [ "out" "dev" "devdoc" ]; 34 41 ··· 55 42 56 43 buildInputs = [ 57 44 sqlite 58 - libsoup 45 + (if withLibsoup3 then libsoup_3 else libsoup) 59 46 ]; 60 47 61 48 propagatedBuildInputs = [ ··· 91 78 OpenCycleMap, OpenAerialMap, and Maps for free. 92 79 ''; 93 80 94 - maintainers = teams.gnome.members; 81 + maintainers = teams.gnome.members ++ teams.pantheon.members; 95 82 platforms = platforms.gnu ++ platforms.linux; # arbitrary choice 96 83 }; 97 84 }
+2
pkgs/top-level/all-packages.nix
··· 19615 19615 19616 19616 libchamplain = callPackage ../development/libraries/libchamplain { }; 19617 19617 19618 + libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; }; 19619 + 19618 19620 libchardet = callPackage ../development/libraries/libchardet { }; 19619 19621 19620 19622 libchewing = callPackage ../development/libraries/libchewing { };