pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #273548 from bobby285271/upd/pantheon-appstream-fix

pantheon: Backport AppStream 1.0 build fix

authored by Bobby Rong and committed by GitHub 30ce319f bea3c001

+17 -5
unified split
+9 -5
pkgs/desktops/pantheon/apps/appcenter/default.nix
··· 11 11 , json-glib 12 12 , libgee 13 13 , libhandy 14 - , libsoup 14 + , libportal-gtk3 15 + , libsoup_3 15 16 , libxml2 16 17 , meson 17 18 , ninja ··· 23 24 24 25 stdenv.mkDerivation rec { 25 26 pname = "appcenter"; 26 - version = "7.4.0"; 27 + version = "7.4.0-unstable-2023-12-04"; 27 28 28 29 src = fetchFromGitHub { 29 30 owner = "elementary"; 30 31 repo = pname; 31 - rev = version; 32 - sha256 = "sha256-L6MGbzzujr4tEB2Cpd7IU+3mOtSCt2hLPw4mOfZ4TkQ="; 32 + # Add support for AppStream 1.0. 33 + # https://github.com/elementary/appcenter/pull/2099 34 + rev = "d93e135a0b0c9a6e0fbad18fe90d46425823a42c"; 35 + hash = "sha256-b7xux6MuvYZFxufQ5T7DoDNBlsJ/fDR0aUY2Hk/xJoY="; 33 36 }; 34 37 35 38 nativeBuildInputs = [ ··· 50 53 json-glib 51 54 libgee 52 55 libhandy 53 - libsoup 56 + libportal-gtk3 57 + libsoup_3 54 58 libxml2 55 59 polkit 56 60 ];
+8
pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , nix-update-script 5 6 , pkg-config 6 7 , meson ··· 32 33 # https://github.com/ximion/appstream/blob/v0.15.2/src/as-pool.c#L117 33 34 # https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location 34 35 ./fix-metadata-path.patch 36 + 37 + # Add support for AppStream 1.0. 38 + # https://github.com/elementary/feedback/pull/102 39 + (fetchpatch { 40 + url = "https://github.com/elementary/feedback/commit/037b20328f5200a0dac25e6835c0c3f8a7c36f39.patch"; 41 + hash = "sha256-tjUNTCsEBjy/3lzwyIwR4VED57ATiG2CWCmRh7qps+4="; 42 + }) 35 43 ]; 36 44 37 45 nativeBuildInputs = [