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