budgie{,Plugins}: format with nixfmt

This commit is contained in:
seth 2024-07-12 18:39:17 -04:00
parent 6b8b905467
commit 7e150e2e43
No known key found for this signature in database
GPG Key ID: D31BD0D494BBEE86
14 changed files with 330 additions and 303 deletions

View File

@ -1,10 +1,11 @@
{ lib
, stdenv
, fetchFromGitHub
, imagemagick
, jhead
, meson
, ninja
{
lib,
stdenv,
fetchFromGitHub,
imagemagick,
jhead,
meson,
ninja,
}:
stdenv.mkDerivation (finalAttrs: {

View File

@ -1,62 +1,63 @@
{ lib
, stdenv
, fetchFromGitHub
, substituteAll
, accountsservice
, adwaita-icon-theme
, budgie-desktop
, cheese
, clutter
, clutter-gtk
, colord
, colord-gtk
, cups
, docbook-xsl-nons
, fontconfig
, gcr
, gdk-pixbuf
, gettext
, glib
, glib-networking
, glibc
, gnome
, gnome-desktop
, gnome-user-share
, gsettings-desktop-schemas
, gsound
, gtk3
, ibus
, libcanberra-gtk3
, libepoxy
, libgnomekbd
, libgtop
, libgudev
, libhandy
, libkrb5
, libnma
, libpulseaudio
, libpwquality
, librsvg
, libsecret
, libwacom
, libxml2
, libxslt
, meson
, modemmanager
, networkmanager
, networkmanagerapplet
, ninja
, pkg-config
, polkit
, samba
, shadow
, shared-mime-info
, tzdata
, udisks2
, upower
, webp-pixbuf-loader
, wrapGAppsHook3
, enableSshSocket ? false
{
lib,
stdenv,
fetchFromGitHub,
substituteAll,
accountsservice,
adwaita-icon-theme,
budgie-desktop,
cheese,
clutter,
clutter-gtk,
colord,
colord-gtk,
cups,
docbook-xsl-nons,
fontconfig,
gcr,
gdk-pixbuf,
gettext,
glib,
glib-networking,
glibc,
gnome,
gnome-desktop,
gnome-user-share,
gsettings-desktop-schemas,
gsound,
gtk3,
ibus,
libcanberra-gtk3,
libepoxy,
libgnomekbd,
libgtop,
libgudev,
libhandy,
libkrb5,
libnma,
libpulseaudio,
libpwquality,
librsvg,
libsecret,
libwacom,
libxml2,
libxslt,
meson,
modemmanager,
networkmanager,
networkmanagerapplet,
ninja,
pkg-config,
polkit,
samba,
shadow,
shared-mime-info,
tzdata,
udisks2,
upower,
webp-pixbuf-loader,
wrapGAppsHook3,
enableSshSocket ? false,
}:
stdenv.mkDerivation (finalAttrs: {
@ -76,7 +77,12 @@ stdenv.mkDerivation (finalAttrs: {
src = ./paths.patch;
budgie_desktop = budgie-desktop;
gcm = gnome.gnome-color-manager;
inherit cups glibc libgnomekbd shadow;
inherit
cups
glibc
libgnomekbd
shadow
;
inherit networkmanagerapplet tzdata;
})
];
@ -136,9 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
upower
];
mesonFlags = [
(lib.mesonBool "ssh" enableSshSocket)
];
mesonFlags = [ (lib.mesonBool "ssh" enableSshSocket) ];
preConfigure = ''
# For ITS rules
@ -148,12 +152,14 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = ''
# Pull in WebP support for gnome-backgrounds.
# In postInstall to run before gappsWrapperArgsHook.
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
extraLoaders = [
librsvg
webp-pixbuf-loader
];
}}"
export GDK_PIXBUF_MODULE_FILE="${
gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
extraLoaders = [
librsvg
webp-pixbuf-loader
];
}
}"
'';
preFixup = ''

View File

@ -1,15 +1,16 @@
{ lib
, stdenv
, fetchFromGitHub
, desktop-file-utils
, glib
, gtk3
, intltool
, meson
, ninja
, pkg-config
, vala
, wrapGAppsHook3
{
lib,
stdenv,
fetchFromGitHub,
desktop-file-utils,
glib,
gtk3,
intltool,
meson,
ninja,
pkg-config,
vala,
wrapGAppsHook3,
}:
stdenv.mkDerivation (finalAttrs: {

View File

@ -1,39 +1,40 @@
{ lib
, stdenv
, fetchFromGitHub
, accountsservice
, alsa-lib
, budgie-screensaver
, docbook-xsl-nons
, glib
, gnome
, gnome-desktop
, graphene
, gst_all_1
, gtk-doc
, gtk3
, ibus
, intltool
, libcanberra-gtk3
, libgee
, libGL
, libnotify
, libpeas
, libpulseaudio
, libuuid
, libwnck
, magpie
, mesa
, meson
, ninja
, pkg-config
, polkit
, sassc
, upower
, vala
, xfce
, wrapGAppsHook3
, zenity
{
lib,
stdenv,
fetchFromGitHub,
accountsservice,
alsa-lib,
budgie-screensaver,
docbook-xsl-nons,
glib,
gnome,
gnome-desktop,
graphene,
gst_all_1,
gtk-doc,
gtk3,
ibus,
intltool,
libcanberra-gtk3,
libgee,
libGL,
libnotify,
libpeas,
libpulseaudio,
libuuid,
libwnck,
magpie,
mesa,
meson,
ninja,
pkg-config,
polkit,
sassc,
upower,
vala,
xfce,
wrapGAppsHook3,
zenity,
}:
stdenv.mkDerivation (finalAttrs: {
@ -48,9 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo=";
};
patches = [
./plugins.patch
];
patches = [ ./plugins.patch ];
nativeBuildInputs = [
docbook-xsl-nons
@ -97,14 +96,16 @@ stdenv.mkDerivation (finalAttrs: {
libpeas
];
passthru.providedSessions = [
"budgie-desktop"
];
passthru.providedSessions = [ "budgie-desktop" ];
meta = {
description = "Feature-rich, modern desktop designed to keep out the way of the user";
homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop";
license = with lib.licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ];
license = with lib.licenses; [
gpl2Plus
lgpl21Plus
cc-by-sa-30
];
platforms = lib.platforms.linux;
maintainers = lib.teams.budgie.members;
};

View File

@ -1,10 +1,11 @@
{ lib
, stdenv
, glib
, xorg
, wrapGAppsHook3
, budgie-desktop
, plugins ? [ ]
{
lib,
stdenv,
glib,
xorg,
wrapGAppsHook3,
budgie-desktop,
plugins ? [ ],
}:
stdenv.mkDerivation {
@ -13,9 +14,7 @@ stdenv.mkDerivation {
src = null;
paths = [
budgie-desktop
] ++ plugins;
paths = [ budgie-desktop ] ++ plugins;
passAsFile = [ "paths" ];

View File

@ -1,15 +1,16 @@
{ lib
, runCommand
, budgie-desktop
, budgie-desktop-view
, glib
, gsettings-desktop-schemas
, gnome
, nixos-artwork
, nixos-background-light ? nixos-artwork.wallpapers.nineish
, nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray
, extraGSettingsOverrides ? ""
, extraGSettingsOverridePackages ? []
{
lib,
runCommand,
budgie-desktop,
budgie-desktop-view,
glib,
gsettings-desktop-schemas,
gnome,
nixos-artwork,
nixos-background-light ? nixos-artwork.wallpapers.nineish,
nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray,
extraGSettingsOverrides ? "",
extraGSettingsOverridePackages ? [ ],
}:
let
@ -55,24 +56,27 @@ let
'';
gsettingsOverridePackages = [
budgie-desktop
budgie-desktop-view
gsettings-desktop-schemas
gnome.mutter
budgie-desktop
budgie-desktop-view
gsettings-desktop-schemas
gnome.mutter
] ++ extraGSettingsOverridePackages;
in
runCommand "budgie-gsettings-overrides" { preferLocalBuild = true; } ''
data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides"
schema_dir="$data_dir/glib-2.0/schemas"
mkdir -p "$schema_dir"
runCommand "budgie-gsettings-overrides" { preferLocalBuild = true; } ''
data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides"
schema_dir="$data_dir/glib-2.0/schemas"
mkdir -p "$schema_dir"
${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages}
${concatMapStringsSep "\n" (
pkg:
"cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\""
) gsettingsOverridePackages}
chmod -R a+w "$data_dir"
cat - > "$schema_dir/zz-nixos-defaults.gschema.override" <<- EOF
${gsettingsOverrides}
EOF
chmod -R a+w "$data_dir"
cat - > "$schema_dir/zz-nixos-defaults.gschema.override" <<- EOF
${gsettingsOverrides}
EOF
${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir"
''
${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir"
''

View File

@ -1,20 +1,21 @@
{ lib
, stdenv
, fetchFromGitHub
, dbus-glib
, glib
, gnome-desktop
, gtk3
, intltool
, libgnomekbd
, libX11
, linux-pam
, meson
, ninja
, pkg-config
, systemd
, wrapGAppsHook3
, xorg
{
lib,
stdenv,
fetchFromGitHub,
dbus-glib,
glib,
gnome-desktop,
gtk3,
intltool,
libgnomekbd,
libX11,
linux-pam,
meson,
ninja,
pkg-config,
systemd,
wrapGAppsHook3,
xorg,
}:
stdenv.mkDerivation (finalAttrs: {

View File

@ -1,30 +1,31 @@
{ lib
, stdenv
, fetchFromGitHub
, substituteAll
, meson
, ninja
, pkg-config
, gnome
, adwaita-icon-theme
, glib
, gtk3
, gsettings-desktop-schemas
, gnome-desktop
, dbus
, json-glib
, libICE
, xmlto
, docbook_xsl
, docbook_xml_dtd_412
, python3
, libxslt
, gettext
, makeWrapper
, systemd
, xorg
, libepoxy
, bash
{
lib,
stdenv,
fetchFromGitHub,
substituteAll,
meson,
ninja,
pkg-config,
gnome,
adwaita-icon-theme,
glib,
gtk3,
gsettings-desktop-schemas,
gnome-desktop,
dbus,
json-glib,
libICE,
xmlto,
docbook_xsl,
docbook_xml_dtd_412,
python3,
libxslt,
gettext,
makeWrapper,
systemd,
xorg,
libepoxy,
bash,
}:
stdenv.mkDerivation (finalAttrs: {

View File

@ -1,15 +1,19 @@
{ lib, newScope }:
lib.makeScope newScope (self: let
inherit (self) callPackage;
in {
budgie-backgrounds = callPackage ./budgie-backgrounds { };
budgie-control-center = callPackage ./budgie-control-center { };
budgie-desktop = callPackage ./budgie-desktop { };
budgie-desktop-view = callPackage ./budgie-desktop-view { };
budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { };
budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };
budgie-screensaver = callPackage ./budgie-screensaver { };
budgie-session = callPackage ./budgie-session { };
magpie = callPackage ./magpie { };
})
lib.makeScope newScope (
self:
let
inherit (self) callPackage;
in
{
budgie-backgrounds = callPackage ./budgie-backgrounds { };
budgie-control-center = callPackage ./budgie-control-center { };
budgie-desktop = callPackage ./budgie-desktop { };
budgie-desktop-view = callPackage ./budgie-desktop-view { };
budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { };
budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };
budgie-screensaver = callPackage ./budgie-screensaver { };
budgie-session = callPackage ./budgie-session { };
magpie = callPackage ./magpie { };
}
)

View File

@ -1,54 +1,59 @@
{ fetchFromGitHub
, runCommand
, lib
, fetchpatch
, stdenv
, pkg-config
, gnome
, gettext
, gobject-introspection
, cairo
, colord
, lcms2
, pango
, json-glib
, libstartup_notification
, libcanberra
, ninja
, xvfb-run
, xkeyboard_config
, libxcvt
, libxkbfile
, libXdamage
, libxkbcommon
, libXtst
, libinput
, libdrm
, gsettings-desktop-schemas
, glib
, gtk3
, gnome-desktop
, pipewire
, libgudev
, libwacom
, mesa
, meson
, xorgserver
, python3
, wrapGAppsHook3
, gi-docgen
, sysprof
, libsysprof-capture
, desktop-file-utils
, libcap_ng
, graphene
{
fetchFromGitHub,
runCommand,
lib,
fetchpatch,
stdenv,
pkg-config,
gnome,
gettext,
gobject-introspection,
cairo,
colord,
lcms2,
pango,
json-glib,
libstartup_notification,
libcanberra,
ninja,
xvfb-run,
xkeyboard_config,
libxcvt,
libxkbfile,
libXdamage,
libxkbcommon,
libXtst,
libinput,
libdrm,
gsettings-desktop-schemas,
glib,
gtk3,
gnome-desktop,
pipewire,
libgudev,
libwacom,
mesa,
meson,
xorgserver,
python3,
wrapGAppsHook3,
gi-docgen,
sysprof,
libsysprof-capture,
desktop-file-utils,
libcap_ng,
graphene,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "magpie";
version = "0.9.3";
outputs = [ "out" "dev" "devdoc" ];
outputs = [
"out"
"dev"
"devdoc"
];
src = fetchFromGitHub {
owner = "BuddiesOfBudgie";
@ -146,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
libdir = "${finalAttrs.finalPackage}/lib/magpie-0";
tests = {
libdirExists = runCommand "magpie-libdir-exists" {} ''
libdirExists = runCommand "magpie-libdir-exists" { } ''
if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then
echo "passthru.libdir should contain a directory, ${finalAttrs.finalPackage.libdir} is not one."
exit 1

View File

@ -1,13 +1,14 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, vala
, budgie
, gtk3
, libpeas
{
lib,
stdenv,
fetchFromGitHub,
meson,
ninja,
pkg-config,
vala,
budgie,
gtk3,
libpeas,
}:
stdenv.mkDerivation (finalAttrs: {

View File

@ -1,10 +1,11 @@
{ lib
, stdenv
, fetchFromGitHub
, glib
, meson
, ninja
, python3Packages
{
lib,
stdenv,
fetchFromGitHub,
glib,
meson,
ninja,
python3Packages,
}:
stdenv.mkDerivation (finalAttrs: {

View File

@ -1,17 +1,18 @@
{ lib
, stdenv
, fetchFromGitHub
, accountsservice
, budgie
, gtk3
, intltool
, libgee
, libpeas
, meson
, ninja
, pkg-config
, sassc
, vala
{
lib,
stdenv,
fetchFromGitHub,
accountsservice,
budgie,
gtk3,
intltool,
libgee,
libpeas,
meson,
ninja,
pkg-config,
sassc,
vala,
}:
stdenv.mkDerivation (finalAttrs: {

View File

@ -1,4 +1,5 @@
{ callPackage }: {
{ callPackage }:
{
budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { };
budgie-media-player-applet = callPackage ./budgie-media-player-applet { };
budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { };