push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,65 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
meson,
ninja,
nixos-artwork,
glib,
pkg-config,
dbus,
polkit,
accountsservice,
}:
stdenv.mkDerivation rec {
pname = "elementary-default-settings";
version = "8.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "default-settings";
rev = version;
sha256 = "sha256-GUq7kXaidzvqbyeVh4ihcxRqZXOzZO3WMXEe8lf477I=";
};
nativeBuildInputs = [
glib # glib-compile-schemas
meson
ninja
pkg-config
];
buildInputs = [
accountsservice
dbus
polkit
];
mesonFlags = [
"--sysconfdir=${placeholder "out"}/etc"
"-Ddefault-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"
# Do not ship elementary OS specific config files.
"-Dapparmor-profiles=false"
"-Dgeoclue=false"
];
postFixup = ''
# https://github.com/elementary/default-settings/issues/55
rm -r $out/share/cups
rm -r $out/share/applications
'';
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Default settings and configuration files for elementary";
homepage = "https://github.com/elementary/default-settings";
license = licenses.gpl2Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,138 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
linkFarm,
replaceVars,
elementary-greeter,
pkg-config,
meson,
ninja,
vala,
desktop-file-utils,
gtk3,
granite,
libgee,
libhandy,
gala,
gnome-desktop,
gnome-settings-daemon,
mutter,
elementary-icon-theme,
elementary-settings-daemon,
wingpanel-with-indicators,
elementary-gtk-theme,
nixos-artwork,
lightdm,
gdk-pixbuf,
dbus,
accountsservice,
wayland-scanner,
wrapGAppsHook3,
}:
stdenv.mkDerivation rec {
pname = "elementary-greeter";
version = "8.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "greeter";
tag = version;
hash = "sha256-lOk5H1uuaf2Q+z+hRLyhtKAHq+3ibtBzWI7r87KpKgQ=";
};
patches = [
./sysconfdir-install.patch
# Needed until https://github.com/elementary/greeter/issues/360 is fixed
(replaceVars ./hardcode-fallback-background.patch {
default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
})
];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
desktop-file-utils
meson
ninja
pkg-config
vala
wayland-scanner
wrapGAppsHook3
];
buildInputs = [
accountsservice
elementary-icon-theme
elementary-settings-daemon
gala # for io.elementary.desktop.background
gnome-desktop
gnome-settings-daemon
gdk-pixbuf
granite
gtk3
libgee
libhandy
lightdm
mutter
];
mesonFlags = [
# A hook does this but after wrapGAppsHook3 so the files never get wrapped.
"--sbindir=${placeholder "out"}/bin"
# baked into the program for discovery of the greeter configuration
"--sysconfdir=/etc"
"-Dgsd-dir=${gnome-settings-daemon}/libexec/" # trailing slash is needed
];
preFixup = ''
gappsWrapperArgs+=(
# dbus-launch needed in path
--prefix PATH : "${dbus}/bin"
# for `io.elementary.wingpanel -g`
--prefix PATH : "${wingpanel-with-indicators}/bin"
# for the compositor
--prefix PATH : "$out/bin"
# the GTK theme is hardcoded
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
# the icon theme is hardcoded
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
)
'';
postFixup = ''
# Use NixOS default wallpaper
substituteInPlace $out/etc/lightdm/io.elementary.greeter.conf \
--replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" \
"default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"
substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \
--replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter"
'';
passthru = {
updateScript = nix-update-script { };
xgreeters = linkFarm "pantheon-greeter-xgreeters" [
{
path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
name = "io.elementary.greeter.desktop";
}
];
};
meta = with lib; {
description = "LightDM Greeter for Pantheon";
homepage = "https://github.com/elementary/greeter";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
mainProgram = "io.elementary.greeter";
};
}

View File

@@ -0,0 +1,22 @@
diff --git a/src/Widgets/BackgroundImage.vala b/src/Widgets/BackgroundImage.vala
index ae9431c..f0f2a49 100644
--- a/src/Widgets/BackgroundImage.vala
+++ b/src/Widgets/BackgroundImage.vala
@@ -9,7 +9,7 @@ public class Greeter.BackgroundImage : Gtk.EventBox {
public BackgroundImage (string? path) {
if (path == null) {
- path = "/usr/share/backgrounds/elementaryos-default";
+ path = "@default_wallpaper@";
}
try {
@@ -19,7 +19,7 @@ public class Greeter.BackgroundImage : Gtk.EventBox {
critical ("Fallback to default wallpaper");
try {
- full_pixbuf = new Gdk.Pixbuf.from_file ("/usr/share/backgrounds/elementaryos-default");
+ full_pixbuf = new Gdk.Pixbuf.from_file ("@default_wallpaper@");
} catch (GLib.Error e) {
critical (e.message);
}

View File

@@ -0,0 +1,25 @@
From 7bb0d507cbb0122f167127b9f6460bd53d8234de Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 16 Mar 2019 16:07:24 -0400
Subject: [PATCH] 'sysconfdir' will be etc not /etc for install
---
data/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/meson.build b/data/meson.build
index fd54b75..b1120ae 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -20,7 +20,7 @@ i18n.merge_file (
install_data(
meson.project_name() + '.conf',
- install_dir: join_paths(get_option('sysconfdir'), 'lightdm')
+ install_dir: join_paths(get_option('prefix'), 'etc', 'lightdm')
)
test (
--
2.19.2

View File

@@ -0,0 +1,52 @@
{
lib,
runCommand,
mutter,
elementary-default-settings,
glib,
gala,
gnome-settings-daemon,
gtk3,
elementary-dock,
gsettings-desktop-schemas,
extraGSettingsOverrides ? "",
extraGSettingsOverridePackages ? [ ],
}:
let
inherit (lib) concatMapStringsSep;
gsettingsOverridePackages = [
elementary-dock
gnome-settings-daemon
gala
gsettings-desktop-schemas
gtk3
mutter
]
++ extraGSettingsOverridePackages;
in
# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this
runCommand "elementary-gsettings-desktop-schemas" { preferLocalBuild = true; } ''
data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides"
schema_dir="$data_dir/glib-2.0/schemas"
mkdir -p "$schema_dir"
cp -rf "${glib.getSchemaPath gala}"/*.gschema.override "$schema_dir"
${concatMapStringsSep "\n" (
pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"$schema_dir\""
) gsettingsOverridePackages}
chmod -R a+w "$data_dir"
cp "${glib.getSchemaPath elementary-default-settings}"/* "$schema_dir"
cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF
${extraGSettingsOverrides}
EOF
${glib.dev}/bin/glib-compile-schemas $schema_dir
''

View File

@@ -0,0 +1,65 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
meson,
ninja,
pkg-config,
vala,
wrapGAppsHook4,
appcenter,
elementary-settings-daemon,
glib,
gnome-settings-daemon,
granite7,
gtk4,
libadwaita,
libgee,
pantheon-wayland,
}:
stdenv.mkDerivation rec {
pname = "elementary-onboarding";
version = "8.0.3";
src = fetchFromGitHub {
owner = "elementary";
repo = "onboarding";
rev = version;
sha256 = "sha256-e8eYBGQ+qTXsp+E3l0g5UI1nYD75z0ibTtzm0WbqlU4=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
vala
wrapGAppsHook4
];
buildInputs = [
appcenter # settings schema
elementary-settings-daemon # settings schema
glib
gnome-settings-daemon # org.gnome.settings-daemon.plugins.color
granite7
gtk4
libadwaita
libgee
pantheon-wayland
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Onboarding app for new users designed for elementary OS";
homepage = "https://github.com/elementary/onboarding";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
mainProgram = "io.elementary.onboarding";
};
}

View File

@@ -0,0 +1,45 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
meson,
ninja,
pkg-config,
vala,
gtk3,
}:
stdenv.mkDerivation rec {
pname = "elementary-print-shim";
version = "0.1.3";
src = fetchFromGitHub {
owner = "elementary";
repo = "print";
rev = version;
sha256 = "sha256-l2IUu9Mj22lZ5yajPcsGrJcJDakNu4srCV0Qea5ybPA=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
vala
];
buildInputs = [ gtk3 ];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Simple shim for printing support via Contractor";
homepage = "https://github.com/elementary/print";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
mainProgram = "io.elementary.print";
};
}

View File

@@ -0,0 +1,94 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
desktop-file-utils,
gettext,
pkg-config,
gnome-keyring,
gnome-session,
wingpanel,
orca,
onboard,
elementary-default-settings,
gnome-settings-daemon,
runtimeShell,
systemd,
writeText,
meson,
ninja,
}:
stdenv.mkDerivation {
pname = "elementary-session-settings";
# Allow disabling x11 session
# nixpkgs-update: no auto update
version = "8.0.1-unstable-2025-09-15";
src = fetchFromGitHub {
owner = "elementary";
repo = "session-settings";
rev = "e708fd49356f145acd926d30683012d9488f0f9d";
hash = "sha256-wb9UUrEtwtmqtfNS2YPli99ZeY17UdJFQijTKs8mHn4=";
};
/*
This allows `elementary-session-settings` to not use gnome-keyring's ssh capabilities anymore, as they have been
moved to gcr upstream, in an effort to modularize gnome-keyring.
More info can be found here: https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/60
*/
patches = [ ./no-gnome-keyring-ssh-autostart.patch ];
nativeBuildInputs = [
desktop-file-utils
gettext
meson
ninja
pkg-config
];
buildInputs = [
gnome-keyring
gnome-settings-daemon
onboard
orca
systemd
];
mesonFlags = [
"-Dmimeapps-list=false"
"-Ddetect-program-prefixes=true"
# https://github.com/elementary/session-settings/issues/91
"-Dx11=false"
"--sysconfdir=${placeholder "out"}/etc"
];
postInstall = ''
# our mimeapps patched from upstream to exclude:
# * evince.desktop -> org.gnome.Evince.desktop
mkdir -p $out/share/applications
cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list
# absolute path patched sessions
substituteInPlace $out/share/wayland-sessions/pantheon-wayland.desktop \
--replace-fail "Exec=gnome-session" "Exec=${gnome-session}/bin/gnome-session" \
--replace-fail "TryExec=io.elementary.wingpanel" "TryExec=${wingpanel}/bin/io.elementary.wingpanel"
'';
passthru = {
updateScript = nix-update-script { };
providedSessions = [
"pantheon-wayland"
];
};
meta = with lib; {
description = "Session settings for elementary";
homepage = "https://github.com/elementary/session-settings";
license = licenses.gpl2Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,12 @@
diff --git a/session/meson.build b/session/meson.build
index 501e836..3254658 100644
--- a/session/meson.build
+++ b/session/meson.build
@@ -79,7 +79,6 @@ if get_option('detect-program-prefixes') == true
autostarts = {
'gnome-keyring-pkcs11': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-pkcs11.desktop'),
'gnome-keyring-secrets': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-secrets.desktop'),
- 'gnome-keyring-ssh': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-ssh.desktop'),
'onboard-autostart': join_paths(onboard_prefix, 'etc/xdg/autostart', 'onboard-autostart.desktop'),
'orca-autostart': join_paths(orca_prefix, 'etc/xdg/autostart', 'orca-autostart.desktop'),
}

View File

@@ -0,0 +1,168 @@
[Default Applications]
application/ogg=io.elementary.music.desktop
application/oxps=org.gnome.Evince.desktop
application/pdf=org.gnome.Evince.desktop
application/postscript=org.gnome.Evince.desktop
application/vnd.ms-xpsdocument=org.gnome.Evince.desktop
application/vnd.rn-realmedia=io.elementary.videos.desktop
application/x-ar=org.gnome.FileRoller.desktop
application/x-arj=org.gnome.FileRoller.desktop
application/x-bzdvi=org.gnome.Evince.desktop
application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop
application/x-bzip=org.gnome.FileRoller.desktop
application/x-bzpdf=org.gnome.Evince.desktop
application/x-bzpostscript=org.gnome.Evince.desktop
application/x-cbr=org.gnome.Evince.desktop
application/x-cbt=org.gnome.Evince.desktop
application/x-cbz=org.gnome.Evince.desktop
application/x-compress=org.gnome.FileRoller.desktop
application/x-compressed-tar=org.gnome.FileRoller.desktop
application/x-dvi=org.gnome.Evince.desktop
application/x-ear=org.gnome.FileRoller.desktop
application/x-extension-m4a=io.elementary.videos.desktop
application/x-extension-mp4=io.elementary.videos.desktop
application/x-flac=io.elementary.music.desktop
application/x-gtar=org.gnome.FileRoller.desktop
application/x-gzdvi=org.gnome.Evince.desktop
application/x-gzip=org.gnome.FileRoller.desktop
application/x-gzpdf=org.gnome.Evince.desktop
application/x-gzpostscript=org.gnome.Evince.desktop
application/x-lha=org.gnome.FileRoller.desktop
application/x-lhz=org.gnome.FileRoller.desktop
application/x-lzop=org.gnome.FileRoller.desktop
application/x-matroska=io.elementary.videos.desktop
application/x-ogg=io.elementary.music.desktop
application/x-perl=io.elementary.code.desktop
application/x-rar-compressed=org.gnome.FileRoller.desktop
application/x-rar=org.gnome.FileRoller.desktop
application/x-rpm=org.gnome.FileRoller.desktop
application/x-tar=org.gnome.FileRoller.desktop
application/x-war=org.gnome.FileRoller.desktop
application/x-xz-compressed-tar=org.gnome.FileRoller.desktop
application/x-xz=org.gnome.FileRoller.desktop
application/x-xzpdf=org.gnome.Evince.desktop
application/x-zip-compressed=org.gnome.FileRoller.desktop
application/x-zip=org.gnome.FileRoller.desktop
application/x-zoo=org.gnome.FileRoller.desktop
application/xhtml+xml=org.gnome.Epiphany.desktop
application/zip=org.gnome.FileRoller.desktop
audio/3gpp=io.elementary.music.desktop
audio/ac3=io.elementary.music.desktop
audio/AMR-WB=io.elementary.music.desktop
audio/AMR=io.elementary.music.desktop
audio/basic=io.elementary.music.desktop
audio/flac=io.elementary.music.desktop
audio/midi=io.elementary.music.desktop
audio/mp4=io.elementary.music.desktop
audio/mpeg=io.elementary.music.desktop
audio/mpegurl=io.elementary.music.desktop
audio/ogg=io.elementary.music.desktop
audio/prs.sid=io.elementary.music.desktop
audio/vnd.rn-realaudio=io.elementary.music.desktop
audio/x-ape=io.elementary.music.desktop
audio/x-flac=io.elementary.music.desktop
audio/x-gsm=io.elementary.music.desktop
audio/x-it=io.elementary.music.desktop
audio/x-m4a=io.elementary.music.desktop
audio/x-matroska=io.elementary.music.desktop
audio/x-mod=io.elementary.music.desktop
audio/x-mp3=io.elementary.music.desktop
audio/x-mpeg=io.elementary.music.desktop
audio/x-mpegurl=io.elementary.music.desktop
audio/x-ms-asf=io.elementary.music.desktop
audio/x-ms-asx=io.elementary.music.desktop
audio/x-ms-wax=io.elementary.music.desktop
audio/x-ms-wma=io.elementary.music.desktop
audio/x-musepack=io.elementary.music.desktop
audio/x-pn-aiff=io.elementary.music.desktop
audio/x-pn-au=io.elementary.music.desktop
audio/x-pn-realaudio-plugin=io.elementary.music.desktop
audio/x-pn-realaudio=io.elementary.music.desktop
audio/x-pn-wav=io.elementary.music.desktop
audio/x-pn-windows-acm=io.elementary.music.desktop
audio/x-real-audio=io.elementary.music.desktop
audio/x-realaudio=io.elementary.music.desktop
audio/x-sbc=io.elementary.music.desktop
audio/x-scpls=io.elementary.music.desktop
audio/x-speex=io.elementary.music.desktop
audio/x-tta=io.elementary.music.desktop
audio/x-vorbis+ogg=io.elementary.music.desktop
audio/x-vorbis=io.elementary.music.desktop
audio/x-wav=io.elementary.music.desktop
audio/x-wavpack=io.elementary.music.desktop
audio/x-xm=io.elementary.music.desktop
image/bmp=io.elementary.photos-viewer.desktop
image/gif=io.elementary.photos-viewer.desktop
image/jpeg=io.elementary.photos-viewer.desktop
image/jpg=io.elementary.photos-viewer.desktop
image/pjpeg=io.elementary.photos-viewer.desktop
image/png=io.elementary.photos-viewer.desktop
image/tiff=io.elementary.photos-viewer.desktop
image/vnd.djvu=org.gnome.Evince.desktop
image/vnd.rn-realpix=io.elementary.videos.desktop
image/webp=io.elementary.photos-viewer.desktop
image/x-bmp=io.elementary.photos-viewer.desktop
image/x-bzeps=org.gnome.Evince.desktop
image/x-eps=org.gnome.Evince.desktop
image/x-gzeps=org.gnome.Evince.desktop
image/x-png=io.elementary.photos-viewer.desktop
inode/directory=io.elementary.files.desktop
misc/ultravox=io.elementary.videos.desktop
multipart/x-zip=org.gnome.FileRoller.desktop
text/calendar=io.elementary.calendar.desktop
text/html=org.gnome.Epiphany.desktop
text/mathml=io.elementary.code.desktop
text/plain=io.elementary.code.desktop
text/x-chdr=io.elementary.code.desktop
text/x-csrc=io.elementary.code.desktop
text/x-dtd=io.elementary.code.desktop
text/x-java=io.elementary.code.desktop
text/x-python=io.elementary.code.desktop
text/x-sql=io.elementary.code.desktop
text/xml=io.elementary.code.desktop
video/3gpp=io.elementary.videos.desktop
video/dv=io.elementary.videos.desktop
video/fli=io.elementary.videos.desktop
video/flv=io.elementary.videos.desktop
video/mp2t=io.elementary.videos.desktop
video/mp4=io.elementary.videos.desktop
video/mp4v-es=io.elementary.videos.desktop
video/mpeg=io.elementary.videos.desktop
video/msvideo=io.elementary.videos.desktop
video/ogg=io.elementary.videos.desktop
video/quicktime=io.elementary.videos.desktop
video/vivo=io.elementary.videos.desktop
video/vnd.divx=io.elementary.videos.desktop
video/vnd.rn-realvideo=io.elementary.videos.desktop
video/vnd.vivo=io.elementary.videos.desktop
video/webm=io.elementary.videos.desktop
video/x-anim=io.elementary.videos.desktop
video/x-avi=io.elementary.videos.desktop
video/x-flc=io.elementary.videos.desktop
video/x-fli=io.elementary.videos.desktop
video/x-flic=io.elementary.videos.desktop
video/x-flv=io.elementary.videos.desktop
video/x-m4v=io.elementary.videos.desktop
video/x-matroska=io.elementary.videos.desktop
video/x-mpeg=io.elementary.videos.desktop
video/x-ms-asf=io.elementary.videos.desktop
video/x-ms-asx=io.elementary.videos.desktop
video/x-ms-wm=io.elementary.videos.desktop
video/x-ms-wmv=io.elementary.videos.desktop
video/x-ms-wmx=io.elementary.videos.desktop
video/x-ms-wvx=io.elementary.videos.desktop
video/x-msvideo=io.elementary.videos.desktop
video/x-nsv=io.elementary.videos.desktop
video/x-ogm+ogg=io.elementary.videos.desktop
video/x-theora+ogg=io.elementary.videos.desktop
video/x-totem-stream=io.elementary.videos.desktop
x-content/image-dcf=io.elementary.photos.desktop
x-content/image-picturecd=io.elementary.photos.desktop
x-content/video-dvd=io.elementary.videos.desktop
x-content/video-svcd=io.elementary.videos.desktop
x-content/video-vcd=io.elementary.videos.desktop
x-scheme-handler/http=org.gnome.Epiphany.desktop
x-scheme-handler/https=org.gnome.Epiphany.desktop
x-scheme-handler/mailto=io.elementary.mail.desktop
x-scheme-handler/trash=io.elementary.files.desktop

View File

@@ -0,0 +1,67 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
pkg-config,
meson,
ninja,
vala,
desktop-file-utils,
gala,
gsettings-desktop-schemas,
gtk4,
glib,
gnome-settings-daemon,
granite7,
libgee,
mutter,
pantheon-wayland,
wrapGAppsHook4,
}:
stdenv.mkDerivation rec {
pname = "elementary-shortcut-overlay";
version = "8.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "shortcut-overlay";
rev = version;
sha256 = "sha256-oGExG7eWiZqXEPBRuLRTnbgo3hRVKo8vO51vMBPoQb0=";
};
nativeBuildInputs = [
desktop-file-utils
meson
ninja
pkg-config
vala
wrapGAppsHook4
];
buildInputs = [
gala # org.pantheon.desktop.gala.keybindings
gsettings-desktop-schemas # org.gnome.desktop.wm.keybindings
glib
gnome-settings-daemon # org.gnome.settings-daemon.plugins.media-keys
granite7
gtk4
libgee
mutter # org.gnome.mutter.keybindings
pantheon-wayland
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Native OS-wide shortcut overlay to be launched by Gala";
homepage = "https://github.com/elementary/shortcut-overlay";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
mainProgram = "io.elementary.shortcut-overlay";
};
}

View File

@@ -0,0 +1,53 @@
{
lib,
stdenv,
fetchFromGitHub,
unstableGitUpdater,
replaceVars,
file-roller,
}:
stdenv.mkDerivation {
pname = "file-roller-contract";
version = "0-unstable-2021-02-22";
src = fetchFromGitHub {
owner = "elementary";
repo = "file-roller-contract";
rev = "cf001d84a7e2ddcfbee2cfdb19885798a869833e";
sha256 = "sha256-jnXq44NiQiSYsvaBF828TklLg9d6z6n+gCZKgbFiERI=";
};
patches = [
(replaceVars ./exec-path.patch {
file_roller = file-roller;
})
];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/contractor
cp *.contract $out/share/contractor/
runHook postInstall
'';
passthru = {
updateScript = unstableGitUpdater {
url = "https://github.com/elementary/file-roller-contract.git";
};
};
meta = with lib; {
description = "Contractor extension for File Roller";
homepage = "https://github.com/elementary/file-roller-contract";
license = licenses.gpl3Plus;
teams = [ teams.pantheon ];
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,22 @@
diff --git a/io.elementary.contractor.file-roller-compress.contract b/io.elementary.contractor.file-roller-compress.contract
index 11e4da3..d58549f 100644
--- a/io.elementary.contractor.file-roller-compress.contract
+++ b/io.elementary.contractor.file-roller-compress.contract
@@ -3,5 +3,5 @@ Name=Compress
Icon=add-files-to-archive
Description=Create a compressed archive with the selected objects
MimeType=!archive;inode/blockdevice;inode/chardevice;inode/fifo;inode/socket;
-Exec=file-roller --add %U
+Exec=@file_roller@/bin/file-roller --add %U
Gettext-Domain=file-roller
diff --git a/io.elementary.contractor.file-roller-extract-here.contract b/io.elementary.contractor.file-roller-extract-here.contract
index 184a6f2..345f4e7 100644
--- a/io.elementary.contractor.file-roller-extract-here.contract
+++ b/io.elementary.contractor.file-roller-extract-here.contract
@@ -3,5 +3,5 @@ Name=Extract Here
Icon=extract-archive
Description=Extract the contents of the archives in the archive folder and quit the program
MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;
-Exec=file-roller --extract-here %U
+Exec=@file_roller@/bin/file-roller --extract-here %U
Gettext-Domain=file-roller

View File

@@ -0,0 +1,97 @@
{
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
desktop-file-utils,
gettext,
libxml2,
meson,
ninja,
pkg-config,
vala,
wayland-scanner,
wrapGAppsHook3,
at-spi2-core,
gnome-settings-daemon,
gnome-desktop,
granite,
granite7,
gtk3,
gtk4,
libcanberra,
libgee,
libhandy,
mutter,
sqlite,
systemd,
nix-update-script,
}:
stdenv.mkDerivation rec {
pname = "gala";
version = "8.2.5";
src = fetchFromGitHub {
owner = "elementary";
repo = "gala";
rev = version;
hash = "sha256-uupFeQ73hr6ziLEtzgVJWASUxhspXJX54/U+3PLSCFY=";
};
patches = [
# We look for plugins in `/run/current-system/sw/lib/` because
# there are multiple plugin providers (e.g. gala and wingpanel).
./plugins-dir.patch
# Fix gtk3 daemon menu location with x2 scaling
# https://github.com/elementary/gala/pull/2493
(fetchpatch {
url = "https://github.com/elementary/gala/commit/33bc3ebe7f175c61845feaf2d06083f1e3b64ddc.patch";
hash = "sha256-hjjiKcO5o/OABKD8vUsVyqtNKN4ffEOGZntLceLr2+k=";
})
];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
desktop-file-utils
gettext
libxml2
meson
ninja
pkg-config
vala
wayland-scanner
wrapGAppsHook3
];
buildInputs = [
at-spi2-core
gnome-settings-daemon
gnome-desktop
granite
granite7
gtk3
gtk4 # gala-daemon
libcanberra
libgee
libhandy
mutter
sqlite
systemd
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Window & compositing manager based on mutter and designed by elementary for use with Pantheon";
homepage = "https://github.com/elementary/gala";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
mainProgram = "gala";
};
}

View File

@@ -0,0 +1,21 @@
diff --git a/meson.build b/meson.build
index d0f00e5..977d2e2 100644
--- a/meson.build
+++ b/meson.build
@@ -25,6 +25,7 @@ vapi_dir = meson.current_source_dir() / 'vapi'
locale_dir = join_paths(get_option('prefix'), get_option('localedir'))
data_dir = join_paths(get_option('prefix'), get_option('datadir'))
plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
+plugins_dir_for_build = join_paths('/run/current-system/sw/lib/', meson.project_name(), 'plugins')
pkgdata_dir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
pkglib_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name())
@@ -33,7 +34,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
conf.set_quoted('LOCALEDIR', locale_dir)
conf.set_quoted('DATADIR', data_dir)
conf.set_quoted('PKGDATADIR', pkgdata_dir)
-conf.set_quoted('PLUGINDIR', plugins_dir)
+conf.set_quoted('PLUGINDIR', plugins_dir_for_build)
conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala')
conf.set_quoted('VERSION', gala_version)
conf.set_quoted('SCHEMA', 'org.pantheon.desktop.gala')

View File

@@ -0,0 +1,59 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
meson,
ninja,
pkg-config,
python3,
vala,
granite,
gtk3,
libgee,
wingpanel,
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-a11y";
version = "1.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "wingpanel-indicator-a11y";
rev = version;
sha256 = "sha256-HECK+IEUAKJ4F1TotTHF84j4BYS6EZdAtLBoM401+mw=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
python3
vala
];
buildInputs = [
granite
gtk3
libgee
wingpanel
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Universal Access Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-a11y";
license = licenses.gpl2Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,83 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
replaceVars,
meson,
ninja,
pkg-config,
vala,
granite,
libgee,
gettext,
gtk3,
json-glib,
switchboard-with-plugs,
wingpanel,
zeitgeist,
bc,
libhandy,
}:
stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "8.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "applications-menu";
rev = version;
sha256 = "sha256-bwQI41Znm75GFoXxSbWkY9daAJTMvUo+UHyyPmvzOUA=";
};
patches = [
(replaceVars ./fix-paths.patch {
bc = "${bc}/bin/bc";
})
];
nativeBuildInputs = [
gettext
meson
ninja
pkg-config
vala
];
buildInputs = [
granite
gtk3
json-glib
libgee
libhandy
switchboard-with-plugs
wingpanel
zeitgeist
]
++
# applications-menu has a plugin to search switchboard plugins
# see https://github.com/NixOS/nixpkgs/issues/100209
# wingpanel's wrapper will need to pick up the fact that
# applications-menu needs a version of switchboard with all
# its plugins for search.
switchboard-with-plugs.buildInputs;
mesonFlags = [
"--sysconfdir=${placeholder "out"}/etc"
];
doCheck = true;
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Lightweight and stylish app launcher for Pantheon";
homepage = "https://github.com/elementary/applications-menu";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,40 @@
diff --git a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
index 84454146..fb082fe4 100644
--- a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
+++ b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
@@ -73,7 +73,7 @@ namespace Synapse {
Pid pid;
int read_fd, write_fd;
/* Must include math library to get non-integer results and to access standard math functions */
- string[] argv = {"bc", "-l"};
+ string[] argv = {"@bc@", "-l"};
Process.spawn_async_with_pipes (
null, argv, null,
diff --git a/src/synapse-plugins/calculator-plugin/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
index 089b8278..0e532bfc 100644
--- a/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
+++ b/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
@@ -47,8 +47,7 @@ namespace Synapse {
DataSink.PluginRegistry.get_default ().register_plugin (
typeof (CalculatorPlugin),
"accessories-calculator",
- register_plugin,
- Environment.find_program_in_path ("bc") != null
+ register_plugin
);
}
diff --git a/src/synapse-plugins/converter-plugin/converter-plugin.vala b/src/synapse-plugins/converter-plugin/converter-plugin.vala
index 34391e6a..a5bfc71e 100644
--- a/src/synapse-plugins/converter-plugin/converter-plugin.vala
+++ b/src/synapse-plugins/converter-plugin/converter-plugin.vala
@@ -44,8 +44,7 @@ namespace Synapse {
DataSink.PluginRegistry.get_default ().register_plugin (
typeof (ConverterPlugin),
"accessories-converter",
- register_plugin,
- Environment.find_program_in_path ("bc") != null
+ register_plugin
);
}

View File

@@ -0,0 +1,60 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
pkg-config,
meson,
ninja,
vala,
gtk3,
glib,
granite,
libnotify,
wingpanel,
libgee,
libxml2,
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-bluetooth";
version = "8.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "wingpanel-indicator-bluetooth";
rev = version;
sha256 = "sha256-N0ehiK8sYAZ/3Lu2u7dut7ZflroFptALFCxjbI0++BA=";
};
nativeBuildInputs = [
glib # for glib-compile-schemas
libxml2
meson
ninja
pkg-config
vala
];
buildInputs = [
glib
granite
gtk3
libgee
libnotify
wingpanel
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Bluetooth Indicator for Wingpanel";
mainProgram = "io.elementary.bluetooth";
homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,68 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
replaceVars,
pkg-config,
meson,
ninja,
vala,
gtk3,
granite,
wingpanel,
evolution-data-server,
libical,
libgee,
libhandy,
libxml2,
elementary-calendar,
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-datetime";
version = "2.4.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "wingpanel-indicator-datetime";
rev = version;
sha256 = "sha256-iR80pF3KUe0WboFm2/f1ZK9/wER2LfmRBd92e8jGTHs=";
};
patches = [
(replaceVars ./fix-paths.patch {
elementary_calendar = elementary-calendar;
})
];
nativeBuildInputs = [
libxml2
meson
ninja
pkg-config
vala
];
buildInputs = [
evolution-data-server
granite
gtk3
libgee
libhandy
libical
wingpanel
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Date & Time Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-datetime";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,26 @@
diff --git a/src/Indicator.vala b/src/Indicator.vala
index 4aba03c..6385bc9 100644
--- a/src/Indicator.vala
+++ b/src/Indicator.vala
@@ -55,7 +55,7 @@ public class DateTime.Indicator : Wingpanel.Indicator {
panel_label.button_press_event.connect ((e) => {
if (e.button == Gdk.BUTTON_MIDDLE) {
- var command = "io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
+ var command = "@elementary_calendar@/bin/io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
try {
var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE);
appinfo.launch_uris (null, null);
diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala
index cb54253..7477d1a 100644
--- a/src/Widgets/calendar/CalendarView.vala
+++ b/src/Widgets/calendar/CalendarView.vala
@@ -242,7 +242,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
// TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app.
public void show_date_in_maya (GLib.DateTime date) {
- var command = "io.elementary.calendar --show-day %s".printf (date.format ("%F"));
+ var command = "@elementary_calendar@/bin/io.elementary.calendar --show-day %s".printf (date.format ("%F"));
try {
var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE);

View File

@@ -0,0 +1,66 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
pkg-config,
meson,
ninja,
replaceVars,
vala,
gtk3,
granite,
libxml2,
wingpanel,
libgee,
xorg,
libgnomekbd,
ibus,
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-keyboard";
version = "2.4.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "wingpanel-indicator-keyboard";
rev = version;
sha256 = "sha256-vPQ+Bt7ggeT3Zzsvbie8Wpu3D2WMEIh8GDOI3frnedM=";
};
patches = [
(replaceVars ./fix-paths.patch {
gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display";
})
];
nativeBuildInputs = [
meson
ninja
libxml2
pkg-config
vala
];
buildInputs = [
granite
gtk3
ibus
libgee
wingpanel
xorg.xkeyboardconfig
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Keyboard Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-keyboard";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,13 @@
diff --git a/src/Indicator.vala b/src/Indicator.vala
index cd7ca49..7813789 100644
--- a/src/Indicator.vala
+++ b/src/Indicator.vala
@@ -94,7 +94,7 @@ public class Keyboard.Indicator : Wingpanel.Indicator {
private void show_keyboard_map () {
close ();
- string command = "gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\"";
+ string command = "@gkbd_keyboard_display@ \"--layout=" + layouts.get_current_with_variant () + "\"";
try {
AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null);

View File

@@ -0,0 +1,58 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
pkg-config,
meson,
ninja,
vala,
gtk3,
granite,
networkmanager,
polkit,
libnma,
wingpanel,
libgee,
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-network";
version = "8.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "wingpanel-indicator-network";
rev = version;
sha256 = "sha256-7zp/GwM+aSQie82asX6yFPSPUxtzeyxCwdr8DWc0LQk=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
vala
];
buildInputs = [
granite
gtk3
libgee
networkmanager
polkit
libnma
wingpanel
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Network Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-network";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,54 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
pkg-config,
meson,
ninja,
vala,
gtk3,
granite,
wingpanel,
libgee,
libxml2,
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-nightlight";
version = "2.1.3";
src = fetchFromGitHub {
owner = "elementary";
repo = "wingpanel-indicator-nightlight";
rev = version;
sha256 = "sha256-77+JGJ0/Y9UJwOuKfJAqjNnmZfBy/YiEwCybx6yoVwM=";
};
nativeBuildInputs = [
libxml2
meson
ninja
pkg-config
vala
];
buildInputs = [
granite
gtk3
libgee
wingpanel
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Night Light Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-nightlight";
license = licenses.gpl2Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,56 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
pkg-config,
meson,
ninja,
vala,
gtk3,
granite,
wingpanel,
libgee,
libhandy,
elementary-notifications,
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-notifications";
version = "7.1.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "wingpanel-indicator-notifications";
rev = version;
sha256 = "sha256-fuC9ldDjKuy1kBeFOAIZ/Onhl2o45Xj+YjSrfYz1xvw=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
vala
];
buildInputs = [
elementary-notifications
granite
gtk3
libgee
libhandy
wingpanel
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Notifications Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-notifications";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,70 @@
{
lib,
stdenv,
fetchFromGitHub,
replaceVars,
nix-update-script,
gnome-power-manager,
pkg-config,
meson,
ninja,
vala,
elementary-settings-daemon,
gettext,
gtk3,
granite,
libgtop,
libnotify,
udev,
wingpanel,
libgee,
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-power";
version = "8.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "wingpanel-indicator-power";
rev = version;
sha256 = "sha256-AeeL/OcQ7V3HT3IWhTQHx/dcCSqL/0s/fShPq96V3xE=";
};
patches = [
(replaceVars ./fix-paths.patch {
gnome_power_manager = gnome-power-manager;
})
];
nativeBuildInputs = [
gettext # msgfmt
meson
ninja
pkg-config
vala
];
buildInputs = [
elementary-settings-daemon
granite
gtk3
libgee
libgtop
libnotify
udev
wingpanel
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Power Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-power";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,13 @@
diff --git a/src/Widgets/DeviceList.vala b/src/Widgets/DeviceList.vala
index 0c56f46..33d97b3 100644
--- a/src/Widgets/DeviceList.vala
+++ b/src/Widgets/DeviceList.vala
@@ -39,7 +39,7 @@ public class Power.Widgets.DeviceList : Gtk.ListBox {
string device_path = path_entries.@get (value);
try {
AppInfo statistics_app = AppInfo.create_from_commandline (
- "gnome-power-statistics --device " + device_path,
+ "@gnome_power_manager@/bin/gnome-power-statistics --device " + device_path,
"",
AppInfoCreateFlags.NONE
);

View File

@@ -0,0 +1,69 @@
{
stdenv,
lib,
fetchFromGitHub,
nix-update-script,
glib,
meson,
ninja,
pkg-config,
vala,
wayland-scanner,
accountsservice,
elementary-settings-daemon,
granite,
gtk3,
libgee,
libhandy,
libportal,
packagekit,
wayland,
wingpanel,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wingpanel-quick-settings";
version = "1.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "quick-settings";
rev = finalAttrs.version;
hash = "sha256-82XlZDnXuUB0PPmInrSQh1vrwnOYt9RplKWwYxIirVo=";
};
nativeBuildInputs = [
glib # glib-compile-resources
meson
ninja
pkg-config
vala
wayland-scanner
];
buildInputs = [
accountsservice
elementary-settings-daemon # for prefers-color-scheme
glib
granite
gtk3
libgee
libhandy
libportal
packagekit
wayland
wingpanel
];
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Quick settings menu for Wingpanel";
homepage = "https://github.com/elementary/quick-settings";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
teams = [ lib.teams.pantheon ];
};
})

View File

@@ -0,0 +1,62 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
pkg-config,
meson,
ninja,
vala,
gnome-settings-daemon,
gtk3,
granite,
wingpanel,
libnotify,
pulseaudio,
libcanberra-gtk3,
libgee,
libxml2,
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-sound";
version = "8.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "wingpanel-indicator-sound";
rev = version;
sha256 = "sha256-oWgq8rgdK81QsN/LhVUk6YgKYG4pFjVfu00t974n+i8=";
};
nativeBuildInputs = [
libxml2
meson
ninja
pkg-config
vala
];
buildInputs = [
gnome-settings-daemon # media-keys
granite
gtk3
libcanberra-gtk3
libgee
libnotify
pulseaudio
wingpanel
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Sound Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-sound";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,90 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
wayland-scanner,
wrapGAppsHook3,
pkg-config,
meson,
ninja,
vala,
gala,
gtk3,
libgee,
granite,
gettext,
mutter,
wayland,
json-glib,
elementary-gtk-theme,
elementary-icon-theme,
}:
stdenv.mkDerivation rec {
pname = "wingpanel";
version = "8.0.3";
src = fetchFromGitHub {
owner = "elementary";
repo = "wingpanel";
rev = version;
sha256 = "sha256-3UNtqfDqgclRE8Pe9N8rOt6i2FG6lKNfJAv5Q2OYXUU=";
};
patches = [
./indicators.patch
];
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
gettext
meson
ninja
pkg-config
vala
wayland-scanner
wrapGAppsHook3
];
buildInputs = [
elementary-icon-theme
gala
granite
gtk3
json-glib
libgee
mutter
wayland
];
preFixup = ''
gappsWrapperArgs+=(
# this GTK theme is required
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
# the icon theme is required
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
)
'';
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Extensible top panel for Pantheon";
longDescription = ''
Wingpanel is an empty container that accepts indicators as extensions,
including the applications menu.
'';
homepage = "https://github.com/elementary/wingpanel";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
mainProgram = "io.elementary.wingpanel";
};
}

View File

@@ -0,0 +1,21 @@
diff --git a/lib/IndicatorManager.vala b/lib/IndicatorManager.vala
index a99a1ec..0ae7799 100644
--- a/lib/IndicatorManager.vala
+++ b/lib/IndicatorManager.vala
@@ -115,7 +115,15 @@ public class Wingpanel.IndicatorManager : GLib.Object {
}
/* load indicators */
- var base_folder = File.new_for_path (Build.INDICATORS_DIR);
+
+ var indicators_path = Environment.get_variable("WINGPANEL_INDICATORS_PATH");
+ if (indicators_path != null) {
+ debug ("WINGPANEL_INDICATORS_PATH set to %s", indicators_path);
+ } else {
+ critical ("WINGPANEL_INDICATORS_PATH not set");
+ }
+
+ var base_folder = File.new_for_path (indicators_path);
try {
monitor = base_folder.monitor_directory (FileMonitorFlags.NONE, null);

View File

@@ -0,0 +1,64 @@
{
lib,
wrapGAppsHook3,
glib,
stdenv,
xorg,
wingpanel,
wingpanelIndicators,
switchboard-with-plugs,
indicators ? null,
# Only useful to disable for development testing.
useDefaultIndicators ? true,
}:
let
selectedIndicators =
if indicators == null then
wingpanelIndicators
else
indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators);
in
stdenv.mkDerivation {
pname = "${wingpanel.pname}-with-indicators";
inherit (wingpanel) version;
src = null;
paths = [
wingpanel
]
++ selectedIndicators;
passAsFile = [ "paths" ];
nativeBuildInputs = [
glib
wrapGAppsHook3
];
buildInputs = lib.forEach selectedIndicators (x: x.buildInputs) ++ selectedIndicators;
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
preferLocalBuild = true;
allowSubstitutes = false;
installPhase = ''
mkdir -p $out
for i in $(cat $pathsPath); do
${xorg.lndir}/bin/lndir -silent $i $out
done
'';
preFixup = ''
gappsWrapperArgs+=(
--set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel"
--set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard-3"
)
'';
inherit (wingpanel) meta;
}