pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #142633 from bobby285271/pantheon

Pantheon updates 2021-10-22

authored by

davidak and committed by
GitHub 27d39f7f 87304645

+33 -21
unified split
+17 -9
pkgs/desktops/pantheon/apps/elementary-photos/default.nix
··· 1 { lib, stdenv 2 , fetchFromGitHub 3 , nix-update-script 4 , pantheon 5 , meson 6 , ninja 7 , pkg-config 8 - , vala_0_52 9 , desktop-file-utils 10 , gtk3 11 , libaccounts-glib ··· 45 sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc"; 46 }; 47 48 - passthru = { 49 - updateScript = nix-update-script { 50 - attrPath = "pantheon.${pname}"; 51 - }; 52 - }; 53 54 nativeBuildInputs = [ 55 appstream ··· 58 ninja 59 pkg-config 60 python3 61 - # Does not build with vala 0.54 62 - # https://github.com/elementary/photos/issues/638 63 - vala_0_52 64 wrapGAppsHook 65 ]; 66 ··· 99 chmod +x meson/post_install.py 100 patchShebangs meson/post_install.py 101 ''; 102 103 meta = with lib; { 104 description = "Photo viewer and organizer designed for elementary OS";
··· 1 { lib, stdenv 2 , fetchFromGitHub 3 + , fetchpatch 4 , nix-update-script 5 , pantheon 6 , meson 7 , ninja 8 , pkg-config 9 + , vala 10 , desktop-file-utils 11 , gtk3 12 , libaccounts-glib ··· 46 sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc"; 47 }; 48 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 + ]; 57 58 nativeBuildInputs = [ 59 appstream ··· 62 ninja 63 pkg-config 64 python3 65 + vala 66 wrapGAppsHook 67 ]; 68 ··· 101 chmod +x meson/post_install.py 102 patchShebangs meson/post_install.py 103 ''; 104 + 105 + passthru = { 106 + updateScript = nix-update-script { 107 + attrPath = "pantheon.${pname}"; 108 + }; 109 + }; 110 111 meta = with lib; { 112 description = "Photo viewer and organizer designed for elementary OS";
+2 -2
pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
··· 10 11 stdenv.mkDerivation rec { 12 pname = "elementary-gtk-theme"; 13 - version = "6.0.0"; 14 15 repoName = "stylesheet"; 16 ··· 18 owner = "elementary"; 19 repo = repoName; 20 rev = version; 21 - sha256 = "08iga854s6w77xr5rhvr74pgn2lc884aigc7gkn0xjlwysd195fr"; 22 }; 23 24 passthru = {
··· 10 11 stdenv.mkDerivation rec { 12 pname = "elementary-gtk-theme"; 13 + version = "6.1.0"; 14 15 repoName = "stylesheet"; 16 ··· 18 owner = "elementary"; 19 repo = repoName; 20 rev = version; 21 + sha256 = "sha256-YvBjMbC3aQtYc/jPZmGdL4VfBH/VuxQ70PD0BWg9DTg="; 22 }; 23 24 passthru = {
+14 -10
pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
··· 7 , meson 8 , python3 9 , ninja 10 - , vala_0_52 11 , gtk3 12 , granite 13 , wingpanel ··· 36 url = "https://github.com/elementary/wingpanel-indicator-sound/commit/df816104c15e4322c1077313b1f43114cdaf710e.patch"; 37 sha256 = "029z7l467jz1ymxwrzrf874062r6xmskl7mldpq39jh110fijy5l"; 38 }) 39 ]; 40 41 - passthru = { 42 - updateScript = nix-update-script { 43 - attrPath = "pantheon.${pname}"; 44 - }; 45 - }; 46 - 47 nativeBuildInputs = [ 48 libxml2 49 meson 50 ninja 51 pkg-config 52 python3 53 - # Does not build with vala 0.54 54 - # https://github.com/elementary/wingpanel-indicator-sound/issues/219 55 - vala_0_52 56 ]; 57 58 buildInputs = [ ··· 69 chmod +x meson/post_install.py 70 patchShebangs meson/post_install.py 71 ''; 72 73 meta = with lib; { 74 description = "Sound Indicator for Wingpanel";
··· 7 , meson 8 , python3 9 , ninja 10 + , vala 11 , gtk3 12 , granite 13 , wingpanel ··· 36 url = "https://github.com/elementary/wingpanel-indicator-sound/commit/df816104c15e4322c1077313b1f43114cdaf710e.patch"; 37 sha256 = "029z7l467jz1ymxwrzrf874062r6xmskl7mldpq39jh110fijy5l"; 38 }) 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 + }) 45 ]; 46 47 nativeBuildInputs = [ 48 libxml2 49 meson 50 ninja 51 pkg-config 52 python3 53 + vala 54 ]; 55 56 buildInputs = [ ··· 67 chmod +x meson/post_install.py 68 patchShebangs meson/post_install.py 69 ''; 70 + 71 + passthru = { 72 + updateScript = nix-update-script { 73 + attrPath = "pantheon.${pname}"; 74 + }; 75 + }; 76 77 meta = with lib; { 78 description = "Sound Indicator for Wingpanel";