Unverified Commit 30ce319f authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

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

pantheon: Backport AppStream 1.0 build fix
parents bea3c001 fed0cb17

pkgs/desktops/pantheon/apps/appcenter/default.nix

+9 −5
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ 
, json-glib

, libgee

, libhandy

, libsoup

, libportal-gtk3

, libsoup_3

, libxml2

, meson

, ninja
@@ -23,13 +24,15 @@ 


stdenv.mkDerivation rec {

  pname = "appcenter";

  version = "7.4.0";

  version = "7.4.0-unstable-2023-12-04";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-L6MGbzzujr4tEB2Cpd7IU+3mOtSCt2hLPw4mOfZ4TkQ=";

    # Add support for AppStream 1.0.

    # https://github.com/elementary/appcenter/pull/2099

    rev = "d93e135a0b0c9a6e0fbad18fe90d46425823a42c";

    hash = "sha256-b7xux6MuvYZFxufQ5T7DoDNBlsJ/fDR0aUY2Hk/xJoY=";

  };



  nativeBuildInputs = [
@@ -50,7 +53,8 @@ stdenv.mkDerivation rec { 
    json-glib

    libgee

    libhandy

    libsoup

    libportal-gtk3

    libsoup_3

    libxml2

    polkit

  ];

pkgs/desktops/pantheon/apps/elementary-feedback/default.nix

+8 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, nix-update-script

, pkg-config

, meson
@@ -32,6 +33,13 @@ stdenv.mkDerivation rec { 
    # https://github.com/ximion/appstream/blob/v0.15.2/src/as-pool.c#L117

    # https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location

    ./fix-metadata-path.patch



    # Add support for AppStream 1.0.

    # https://github.com/elementary/feedback/pull/102

    (fetchpatch {

      url = "https://github.com/elementary/feedback/commit/037b20328f5200a0dac25e6835c0c3f8a7c36f39.patch";

      hash = "sha256-tjUNTCsEBjy/3lzwyIwR4VED57ATiG2CWCmRh7qps+4=";

    })

  ];



  nativeBuildInputs = [