git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #142633 from bobby285271/pantheon

Pantheon updates 2021-10-22

commit27d39f7f0d36d23669b90dc7f061ba8c72705443 authordavidak <davidak@users.noreply.github.com> dateSat 23 Oct 2021, 13:58 (5 years ago) parent873046415702a7
3 files changed+33−21
compare with master
unifiedsplit
pkgs/desktops/pantheon/apps/elementary-photos/default.nix+17−9 pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix+2−2 pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix+14−10
pkgs/desktops/pantheon/apps/elementary-photos/default.nix+17−9
@@ -1,11 +1,12 @@
11{ lib, stdenv
22, fetchFromGitHub
3+, fetchpatch
34, nix-update-script
45, pantheon
56, meson
67, ninja
78, pkg-config
8−, vala_0_52
9+, vala
910, desktop-file-utils
1011, gtk3
1112, libaccounts-glib
@@ -45,11 +46,14 @@ stdenv.mkDerivation rec {
4546 sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc";
4647 };
4748
48− passthru = {
49− updateScript = nix-update-script {
50− attrPath = "pantheon.${pname}";
51− };
52− };
49+ patches = [
50+ # Fix build with vala 0.54
51+ # https://github.com/elementary/photos/pull/650
52+ (fetchpatch {
53+ url = "https://github.com/elementary/photos/commit/bc7feca8caa4c8fc076a759a2d36e26e93c75596.patch";
54+ sha256 = "sha256-iOHYKV7rSAuMm4ZhoJWjlpu96zlxwTosQe+z/iEVFR8=";
55+ })
56+ ];
5357
5458 nativeBuildInputs = [
5559 appstream
@@ -58,9 +62,7 @@ stdenv.mkDerivation rec {
5862 ninja
5963 pkg-config
6064 python3
61− # Does not build with vala 0.54
62− # https://github.com/elementary/photos/issues/638
63− vala_0_52
65+ vala
6466 wrapGAppsHook
6567 ];
6668
@@ -100,6 +102,12 @@ stdenv.mkDerivation rec {
100102 patchShebangs meson/post_install.py
101103 '';
102104
105+ passthru = {
106+ updateScript = nix-update-script {
107+ attrPath = "pantheon.${pname}";
108+ };
109+ };
110+
103111 meta = with lib; {
104112 description = "Photo viewer and organizer designed for elementary OS";
105113 homepage = "https://github.com/elementary/photos";
pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix+2−2
@@ -10,7 +10,7 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "elementary-gtk-theme";
13− version = "6.0.0";
13+ version = "6.1.0";
1414
1515 repoName = "stylesheet";
1616
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 owner = "elementary";
1919 repo = repoName;
2020 rev = version;
21− sha256 = "08iga854s6w77xr5rhvr74pgn2lc884aigc7gkn0xjlwysd195fr";
21+ sha256 = "sha256-YvBjMbC3aQtYc/jPZmGdL4VfBH/VuxQ70PD0BWg9DTg=";
2222 };
2323
2424 passthru = {
pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix+14−10
@@ -7,7 +7,7 @@
77, meson
88, python3
99, ninja
10−, vala_0_52
10+, vala
1111, gtk3
1212, granite
1313, wingpanel
@@ -36,23 +36,21 @@ stdenv.mkDerivation rec {
3636 url = "https://github.com/elementary/wingpanel-indicator-sound/commit/df816104c15e4322c1077313b1f43114cdaf710e.patch";
3737 sha256 = "029z7l467jz1ymxwrzrf874062r6xmskl7mldpq39jh110fijy5l";
3838 })
39+ # Fix build with vala 0.54
40+ # https://github.com/elementary/wingpanel-indicator-sound/pull/221
41+ (fetchpatch {
42+ url = "https://github.com/elementary/wingpanel-indicator-sound/commit/398d181eabe3dd803dc0ba335ac629902ec5b5ab.patch";
43+ sha256 = "1r2x3n6ws56jk7xcgk60am8mc5dgf8pz5ipsydxvmlrmipkjxyqi";
44+ })
3945 ];
4046
41− passthru = {
42− updateScript = nix-update-script {
43− attrPath = "pantheon.${pname}";
44− };
45− };
46−
4747 nativeBuildInputs = [
4848 libxml2
4949 meson
5050 ninja
5151 pkg-config
5252 python3
53− # Does not build with vala 0.54
54− # https://github.com/elementary/wingpanel-indicator-sound/issues/219
55− vala_0_52
53+ vala
5654 ];
5755
5856 buildInputs = [
@@ -70,6 +68,12 @@ stdenv.mkDerivation rec {
7068 patchShebangs meson/post_install.py
7169 '';
7270
71+ passthru = {
72+ updateScript = nix-update-script {
73+ attrPath = "pantheon.${pname}";
74+ };
75+ };
76+
7377 meta = with lib; {
7478 description = "Sound Indicator for Wingpanel";
7579 homepage = "https://github.com/elementary/wingpanel-indicator-sound";