Merge pull request #249312 from FedericoSchonborn/budgie/magpie
budgie.magpie: init at 0.9.2, replace Mutter with it on Budgie
This commit is contained in:
commit
fd1f73aaa2
|
@ -237,6 +237,11 @@ in {
|
||||||
budgie.budgie-control-center
|
budgie.budgie-control-center
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Register packages for udev.
|
||||||
|
services.udev.packages = with pkgs; [
|
||||||
|
budgie.magpie
|
||||||
|
];
|
||||||
|
|
||||||
# Shell integration for MATE Terminal.
|
# Shell integration for MATE Terminal.
|
||||||
programs.bash.vteIntegration = true;
|
programs.bash.vteIntegration = true;
|
||||||
programs.zsh.vteIntegration = true;
|
programs.zsh.vteIntegration = true;
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
, libwacom
|
, libwacom
|
||||||
, libxml2
|
, libxml2
|
||||||
, libxslt
|
, libxslt
|
||||||
|
, magpie
|
||||||
, meson
|
, meson
|
||||||
, modemmanager
|
, modemmanager
|
||||||
, networkmanager
|
, networkmanager
|
||||||
|
@ -108,7 +109,6 @@ stdenv.mkDerivation rec {
|
||||||
gnome.gnome-remote-desktop
|
gnome.gnome-remote-desktop
|
||||||
gnome.gnome-settings-daemon
|
gnome.gnome-settings-daemon
|
||||||
gnome.gnome-user-share
|
gnome.gnome-user-share
|
||||||
gnome.mutter
|
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
gsound
|
gsound
|
||||||
gtk3
|
gtk3
|
||||||
|
@ -126,6 +126,7 @@ stdenv.mkDerivation rec {
|
||||||
libsecret
|
libsecret
|
||||||
libwacom
|
libwacom
|
||||||
libxml2
|
libxml2
|
||||||
|
magpie
|
||||||
modemmanager
|
modemmanager
|
||||||
networkmanager
|
networkmanager
|
||||||
polkit
|
polkit
|
||||||
|
@ -158,7 +159,7 @@ stdenv.mkDerivation rec {
|
||||||
--prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
|
--prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
|
||||||
--prefix XDG_DATA_DIRS : "${librsvg}/share"
|
--prefix XDG_DATA_DIRS : "${librsvg}/share"
|
||||||
# WM keyboard shortcuts
|
# WM keyboard shortcuts
|
||||||
--prefix XDG_DATA_DIRS : "${gnome.mutter}/share"
|
--prefix XDG_DATA_DIRS : "${magpie}/share"
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, accountsservice
|
, accountsservice
|
||||||
, alsa-lib
|
, alsa-lib
|
||||||
, budgie-screensaver
|
, budgie-screensaver
|
||||||
|
@ -23,6 +24,7 @@
|
||||||
, libpulseaudio
|
, libpulseaudio
|
||||||
, libuuid
|
, libuuid
|
||||||
, libwnck
|
, libwnck
|
||||||
|
, magpie
|
||||||
, mesa
|
, mesa
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
|
@ -47,6 +49,20 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
# Drop all Vapi files that are already included with Vala
|
||||||
|
# https://github.com/BuddiesOfBudgie/budgie-desktop/commit/5f641489a00cc244e50aa1ceae04f952d58389d2
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/5f641489a00cc244e50aa1ceae04f952d58389d2.patch";
|
||||||
|
hash = "sha256-Cyj/+G1dx0DKCTtzVESzFZ+I5o7INopGvw7bq5o/abo=";
|
||||||
|
})
|
||||||
|
|
||||||
|
# Add support for Magpie
|
||||||
|
# https://github.com/BuddiesOfBudgie/budgie-desktop/pull/387
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/84ccb505160322536043717c3b8f970ab91b0103.patch";
|
||||||
|
hash = "sha256-4nd7Tk4ajyVy8cGDNIINpW9jlyRNywPYMrhBCtJVHZk=";
|
||||||
|
})
|
||||||
|
|
||||||
./plugins.patch
|
./plugins.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -70,7 +86,6 @@ stdenv.mkDerivation rec {
|
||||||
gnome-menus
|
gnome-menus
|
||||||
gnome.gnome-bluetooth_1_0
|
gnome.gnome-bluetooth_1_0
|
||||||
gnome.gnome-settings-daemon
|
gnome.gnome-settings-daemon
|
||||||
gnome.mutter
|
|
||||||
gnome.zenity
|
gnome.zenity
|
||||||
graphene
|
graphene
|
||||||
gtk3
|
gtk3
|
||||||
|
@ -83,6 +98,7 @@ stdenv.mkDerivation rec {
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
libuuid
|
libuuid
|
||||||
libwnck
|
libwnck
|
||||||
|
magpie
|
||||||
mesa
|
mesa
|
||||||
polkit
|
polkit
|
||||||
sassc
|
sassc
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
, budgie-desktop
|
, budgie-desktop
|
||||||
, budgie-desktop-view
|
, budgie-desktop-view
|
||||||
, glib
|
, glib
|
||||||
, gnome
|
|
||||||
, gsettings-desktop-schemas
|
, gsettings-desktop-schemas
|
||||||
, mate
|
, mate
|
||||||
, nixos-artwork
|
, nixos-artwork
|
||||||
|
@ -57,7 +56,6 @@ let
|
||||||
budgie-desktop
|
budgie-desktop
|
||||||
budgie-desktop-view
|
budgie-desktop-view
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
gnome.mutter
|
|
||||||
] ++ extraGSettingsOverridePackages;
|
] ++ extraGSettingsOverridePackages;
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
|
@ -8,4 +8,5 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { };
|
budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { };
|
||||||
budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };
|
budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };
|
||||||
budgie-screensaver = callPackage ./budgie-screensaver { };
|
budgie-screensaver = callPackage ./budgie-screensaver { };
|
||||||
|
magpie = callPackage ./magpie { };
|
||||||
})
|
})
|
||||||
|
|
163
pkgs/desktops/budgie/magpie/default.nix
Normal file
163
pkgs/desktops/budgie/magpie/default.nix
Normal file
|
@ -0,0 +1,163 @@
|
||||||
|
{ 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
|
||||||
|
, wrapGAppsHook
|
||||||
|
, gi-docgen
|
||||||
|
, sysprof
|
||||||
|
, libsysprof-capture
|
||||||
|
, desktop-file-utils
|
||||||
|
, libcap_ng
|
||||||
|
, graphene
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "magpie";
|
||||||
|
version = "0.9.2";
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "BuddiesOfBudgie";
|
||||||
|
repo = "magpie";
|
||||||
|
rev = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-GoilHdESFgpwt8+Uqzrnf8jBpeaSak1uHTlkNcQdgtk=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fix build with separate sysprof.
|
||||||
|
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch";
|
||||||
|
sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
mesonFlags = [
|
||||||
|
"-Degl_device=true"
|
||||||
|
"-Dprofiler=true"
|
||||||
|
"-Ddocs=true"
|
||||||
|
"-Dwith_shared_components=true"
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
# required for pkg-config to detect magpie-clutter
|
||||||
|
json-glib
|
||||||
|
libXtst
|
||||||
|
libcap_ng
|
||||||
|
graphene
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
desktop-file-utils
|
||||||
|
gettext
|
||||||
|
libxcvt
|
||||||
|
mesa # needed for gbm
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
xvfb-run
|
||||||
|
pkg-config
|
||||||
|
python3
|
||||||
|
wrapGAppsHook
|
||||||
|
gi-docgen
|
||||||
|
xorgserver
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
cairo
|
||||||
|
glib
|
||||||
|
gnome-desktop
|
||||||
|
gnome.gnome-settings-daemon
|
||||||
|
gobject-introspection
|
||||||
|
gsettings-desktop-schemas
|
||||||
|
gtk3
|
||||||
|
libcanberra
|
||||||
|
libdrm
|
||||||
|
libgudev
|
||||||
|
libinput
|
||||||
|
libstartup_notification
|
||||||
|
libwacom
|
||||||
|
libxkbcommon
|
||||||
|
libxkbfile
|
||||||
|
libXdamage
|
||||||
|
colord
|
||||||
|
lcms2
|
||||||
|
pango
|
||||||
|
pipewire
|
||||||
|
sysprof # for D-Bus interfaces
|
||||||
|
libsysprof-capture
|
||||||
|
xkeyboard_config
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
patchShebangs src/backends/native/gen-default-modes.py
|
||||||
|
# Magpie doesn't install any .desktop files
|
||||||
|
substituteInPlace meson/meson-postinstall.sh --replace "update-desktop-database" "# update-desktop-database"
|
||||||
|
'';
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||||
|
# TODO: Move this into a directory devhelp can find.
|
||||||
|
moveToOutput "share/magpie-0/doc" "$devdoc"
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Install udev files into our own tree.
|
||||||
|
PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
|
||||||
|
|
||||||
|
separateDebugInfo = true;
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
libdir = "${finalAttrs.finalPackage}/lib/magpie-0";
|
||||||
|
|
||||||
|
tests = {
|
||||||
|
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
|
||||||
|
fi
|
||||||
|
touch $out
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Softish fork of Mutter 43.x";
|
||||||
|
homepage = "https://github.com/BuddiesOfBudgie/magpie";
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
|
maintainers = with maintainers; [ federicoschonborn ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
})
|
Loading…
Reference in New Issue
Block a user