mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
Pantheon updates 2025-06-02 (#413274)
This commit is contained in:
commit
5834b4ed76
3 changed files with 14 additions and 6 deletions
|
@ -84,6 +84,12 @@ stdenv.mkDerivation rec {
|
||||||
substituteInPlace meson.build --replace \
|
substituteInPlace meson.build --replace \
|
||||||
"meson.get_compiler('c').find_library('libcurl', dirs: vapidir)" \
|
"meson.get_compiler('c').find_library('libcurl', dirs: vapidir)" \
|
||||||
"meson.get_compiler('c').find_library('libcurl', dirs: '${curl.out}/lib')"
|
"meson.get_compiler('c').find_library('libcurl', dirs: '${curl.out}/lib')"
|
||||||
|
|
||||||
|
# Fix build with Vala 0.56.18
|
||||||
|
# https://github.com/elementary/monitor/issues/444
|
||||||
|
for i in $(find src/Resources -type f -name "*.vala"); do
|
||||||
|
substituteInPlace $i --replace-warn "[Compact]" ""
|
||||||
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
|
|
@ -17,13 +17,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "switchboard-plug-onlineaccounts";
|
pname = "switchboard-plug-onlineaccounts";
|
||||||
version = "8.0.1";
|
version = "8.0.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "elementary";
|
owner = "elementary";
|
||||||
repo = pname;
|
repo = "settings-onlineaccounts";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-E4UAhrs+YQ47VEHMFY8PbSFvBqhqrTf4aPezeqEjdLo=";
|
sha256 = "sha256-0dt4E2g1nX78s2WK2HO6P/fKjXcsR61KJSpulgsZHPI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Switchboard Online Accounts Plug";
|
description = "Switchboard Online Accounts Plug";
|
||||||
homepage = "https://github.com/elementary/switchboard-plug-onlineaccounts";
|
homepage = "https://github.com/elementary/settings-onlineaccounts";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
teams = [ teams.pantheon ];
|
teams = [ teams.pantheon ];
|
||||||
|
|
|
@ -16,18 +16,19 @@
|
||||||
granite7,
|
granite7,
|
||||||
libgee,
|
libgee,
|
||||||
mutter,
|
mutter,
|
||||||
|
pantheon-wayland,
|
||||||
wrapGAppsHook4,
|
wrapGAppsHook4,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "elementary-shortcut-overlay";
|
pname = "elementary-shortcut-overlay";
|
||||||
version = "8.0.1";
|
version = "8.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "elementary";
|
owner = "elementary";
|
||||||
repo = "shortcut-overlay";
|
repo = "shortcut-overlay";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-RWFzs4rw/KC0MXkNfA178FejMbuIBh5FVox1RxmxCJA=";
|
sha256 = "sha256-oGExG7eWiZqXEPBRuLRTnbgo3hRVKo8vO51vMBPoQb0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
|
||||||
gtk4
|
gtk4
|
||||||
libgee
|
libgee
|
||||||
mutter # org.gnome.mutter.keybindings
|
mutter # org.gnome.mutter.keybindings
|
||||||
|
pantheon-wayland
|
||||||
];
|
];
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue