diff options
Diffstat (limited to 'pkgs/desktops')
17 files changed, 223 insertions, 33 deletions
diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 04263c99a74f..585625226d86 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -8,7 +8,6 @@ , glib , gnome , gnome-desktop -, gnome-menus , graphene , gst_all_1 , gtk-doc @@ -32,19 +31,20 @@ , sassc , upower , vala +, xfce , wrapGAppsHook }: stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop"; - version = "10.8.2"; + version = "10.9"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-desktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-K5XUYcFjDJCHhjb/UTO206+UT6lI2P7X1v3SqlYbwPM="; + hash = "sha256-yyuLBzTDEQH7rBOWTYBvS+3x2mlbF34f7U7oOUO8BeA="; }; patches = [ @@ -68,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: { budgie-screensaver glib gnome-desktop - gnome-menus - gnome.gnome-bluetooth_1_0 gnome.gnome-settings-daemon gnome.mutter gnome.zenity @@ -89,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: { polkit sassc upower + xfce.libxfce4windowing ] ++ (with gst_all_1; [ gstreamer gst-plugins-base diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/desktops/budgie/budgie-session/default.nix new file mode 100644 index 000000000000..70b49080cb68 --- /dev/null +++ b/pkgs/desktops/budgie/budgie-session/default.nix @@ -0,0 +1,101 @@ +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, meson +, ninja +, pkg-config +, gnome +, 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: { + pname = "budgie-session"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "BuddiesOfBudgie"; + repo = "budgie-session"; + rev = "v${finalAttrs.version}"; + hash = "sha256-mz+Yh3NK2Tag+MWVofFFXYYXspxhmYBD6YCiuATpZSI="; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + gsettings = "${glib.bin}/bin/gsettings"; + dbusLaunch = "${dbus.lib}/bin/dbus-launch"; + bash = "${bash}/bin/bash"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + makeWrapper + xmlto + libxslt + docbook_xsl + docbook_xml_dtd_412 + python3 + dbus # for DTD + ]; + + buildInputs = [ + glib + gtk3 + libICE + gnome-desktop + json-glib + xorg.xtrans + gnome.adwaita-icon-theme + gnome.gnome-settings-daemon + gsettings-desktop-schemas + systemd + libepoxy + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + # `bin/budgie-session` will reset the environment when run in wayland, we + # therefor wrap `libexec/budgie-session-binary` instead which is the actual + # binary needing wrapping + preFixup = '' + wrapProgram "$out/libexec/budgie-session-binary" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" + ''; + + separateDebugInfo = true; + + meta = { + description = "Session manager for Budgie"; + homepage = "https://github.com/BuddiesOfBudgie/budgie-session"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [federicoschonborn]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/budgie/budgie-session/fix-paths.patch b/pkgs/desktops/budgie/budgie-session/fix-paths.patch new file mode 100644 index 000000000000..1c011d26b549 --- /dev/null +++ b/pkgs/desktops/budgie/budgie-session/fix-paths.patch @@ -0,0 +1,35 @@ +diff --git a/gnome-session/budgie-session.in b/gnome-session/budgie-session.in +index 8a91e061..3e2ef031 100755 +--- a/gnome-session/budgie-session.in ++++ b/gnome-session/budgie-session.in +@@ -7,13 +7,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && + ! (echo "$SHELL" | grep -q "false") && + ! (echo "$SHELL" | grep -q "nologin"); then + if [ "$1" != '-l' ]; then +- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" ++ # Make sure the shell actually sets up the environment. ++ unset __NIXOS_SET_ENVIRONMENT_DONE ++ exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'" + else + shift + fi + fi + +-SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region) ++SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region) + REGION=${SETTING#\'} + REGION=${REGION%\'} + +diff --git a/gnome-session/main.c b/gnome-session/main.c +index 327c7c7f..301ec7ee 100644 +--- a/gnome-session/main.c ++++ b/gnome-session/main.c +@@ -219,7 +219,7 @@ require_dbus_session (int argc, + } + new_argv[i + 2] = NULL; + +- if (!execvp ("dbus-launch", new_argv)) { ++ if (!execvp ("@dbusLaunch@", new_argv)) { + g_set_error (error, + G_SPAWN_ERROR, + G_SPAWN_ERROR_FAILED, diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 73eca3942023..031ec9cd51a0 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -8,5 +8,6 @@ lib.makeScope pkgs.newScope (self: with self; { 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 { }; }) diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 0971731573ee..7352c5549b23 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-AO4/JUysQyGDsQDbP9X7sqmcxyRSkNGjjTEu4fFzDZA="; + hash = "sha256-dNg1e339NWRzyEsRp7I91SwK2H+lU28Ra+7MSgUDk8w="; }; patches = [ diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index e2ac4829db7c..393c51e4ac64 100644 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , dtkwidget , qt5integration , qt5platform-plugins @@ -21,23 +20,15 @@ stdenv.mkDerivation rec { pname = "deepin-compressor"; - version = "5.12.20"; + version = "5.12.23"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-oOxto0X/GBAA9q691uwC0PtCdHDTMBqi80ov4xCXPn0="; + hash = "sha256-8qfpNM2rci4subdodxfJZLP3OvAxXl7QRl4MHGr15nA="; }; - patches = [ - (fetchpatch { - name = "fix-build-failures-for-new-dtkgui.patch"; - url = "https://github.com/linuxdeepin/deepin-compressor/commit/0ee07030034b06021e366d8d6109f344d47ea26c.patch"; - hash = "sha256-P++SxzZCWoXJnLQhC0H/64/LjW/dqnl3hCGBWHVDn9Q="; - }) - ]; - postPatch = '' substituteInPlace src/source/common/pluginmanager.cpp \ --replace "/usr/lib/" "$out/lib/" diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix index e3b4d1166c91..f13715535e09 100644 --- a/pkgs/desktops/deepin/library/dtkcore/default.nix +++ b/pkgs/desktops/deepin/library/dtkcore/default.nix @@ -32,11 +32,6 @@ stdenv.mkDerivation rec { ./fix-pri-path.patch ]; - postPatch = '' - substituteInPlace src/dsysinfo.cpp \ - --replace "/usr/share/deepin/distribution.info" "/etc/distribution.info" \ - ''; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix index aa31bf975ad0..50fa2c6e72e7 100644 --- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix @@ -1,6 +1,7 @@ { stdenvNoCC , lib , fetchFromGitHub +, nixos-icons }: stdenvNoCC.mkDerivation rec { pname = "deepin-desktop-base"; @@ -24,6 +25,15 @@ stdenvNoCC.mkDerivation rec { mv $out/usr/* $out/ rm -r $out/usr install -D ${./distribution_logo_transparent.svg} $out/share/pixmaps/distribution_logo_transparent.svg + cat > $out/share/deepin/distribution.info <<EOF + [Distribution] + Name=NixOS + WebsiteName=www.nixos.org + Website=https://www.nixos.org + Logo=${nixos-icons}/share/icons/hicolor/96x96/apps/nix-snowflake.png + LogoLight=${nixos-icons}/share/icons/hicolor/32x32/apps/nix-snowflake.png + LogoTransparent=$out/share/pixmaps/distribution_logo_transparent.svg + EOF ''; meta = with lib; { diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index dc0cade8d410..710829a5068e 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -25,7 +25,6 @@ , libepoxy , bash , gnome-session-ctl -, gnomeShellSupport ? true }: stdenv.mkDerivation rec { @@ -114,7 +113,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/libexec/gnome-session-binary" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - ${lib.optionalString gnomeShellSupport "--suffix XDG_DATA_DIRS : \"${gnome.gnome-shell}/share\""} \ + --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share" \ --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" ''; diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 6c96c54f86b5..7e2d44249376 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -130,5 +130,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.gnome.members; + mainProgram = "nautilus"; }; }) diff --git a/pkgs/desktops/lomiri/development/deviceinfo/default.nix b/pkgs/desktops/lomiri/development/deviceinfo/default.nix index 00ba1d864bf6..9ddadb83cbec 100644 --- a/pkgs/desktops/lomiri/development/deviceinfo/default.nix +++ b/pkgs/desktops/lomiri/development/deviceinfo/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "deviceinfo"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/deviceinfo"; rev = finalAttrs.version; - hash = "sha256-x0Xm4Z3hpvO5p/5JxMRloFqn58cRH2ak8rKtuxmmVVQ="; + hash = "sha256-wTl+GgNiWzJxGLdU2iMH94UhQ40gjAPTVErouQIGXOA="; }; outputs = [ @@ -57,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library to detect and configure devices"; homepage = "https://gitlab.com/ubports/development/core/deviceinfo"; + changelog = "https://gitlab.com/ubports/development/core/deviceinfo/-/blob/${finalAttrs.version}/ChangeLog"; license = licenses.gpl3Only; maintainers = teams.lomiri.members; platforms = platforms.linux; diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2002-Nixpkgs-versioned-QML-path.patch.in b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2002-Nixpkgs-versioned-QML-path.patch.in new file mode 100644 index 000000000000..d2e83baf98ae --- /dev/null +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2002-Nixpkgs-versioned-QML-path.patch.in @@ -0,0 +1,29 @@ +From ca4c52a80532732243067eb00ec12b4ef84010a6 Mon Sep 17 00:00:00 2001 +From: OPNA2608 <opna2608@protonmail.com> +Date: Tue, 30 Jan 2024 19:46:09 +0100 +Subject: [PATCH] Nixpkgs versioned QML path + +--- + src/LomiriToolkit/uctheme.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/LomiriToolkit/uctheme.cpp b/src/LomiriToolkit/uctheme.cpp +index a10c89344..4b0653589 100644 +--- a/src/LomiriToolkit/uctheme.cpp ++++ b/src/LomiriToolkit/uctheme.cpp +@@ -180,6 +180,12 @@ QStringList themeSearchPath() + pathList << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); + } + ++ // append versioned QML import path from Nixpkgs ++ const QString nixpkgsQmlImportPath = QString::fromLocal8Bit(getenv("NIXPKGS_QT@qtVersion@_QML_IMPORT_PATH")); ++ if (!nixpkgsQmlImportPath.isEmpty()) { ++ pathList << nixpkgsQmlImportPath.split(':', QString::SkipEmptyParts); ++ } ++ + // append QML import path(s); we must explicitly support env override here + const QString qml2ImportPath = QString::fromLocal8Bit(getenv("QML2_IMPORT_PATH")); + if (!qml2ImportPath.isEmpty()) { +-- +2.42.0 + diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix index bac495acdc7c..12d71bdbbb99 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix @@ -3,6 +3,7 @@ , fetchFromGitLab , fetchpatch , gitUpdater +, substituteAll , testers , dbus-test-runner , dpkg @@ -74,6 +75,11 @@ stdenv.mkDerivation (finalAttrs: { }) ./2001-Mark-problematic-tests.patch + (substituteAll { + src = ./2002-Nixpkgs-versioned-QML-path.patch.in; + name = "2002-Nixpkgs-versioned-QML-path.patch"; + qtVersion = lib.versions.major qtbase.version; + }) ]; postPatch = '' diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 6c93c5084b4b..29c0e1b824e9 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -6,6 +6,7 @@ , gtk3 , glib , libxml2 +, libarchive , libsecret , poppler , itstool @@ -14,7 +15,7 @@ , mate , wrapGAppsHook , enableEpub ? true -, webkitgtk +, webkitgtk_4_1 , enableDjvu ? true , djvulibre , enablePostScript ? true @@ -27,11 +28,11 @@ stdenv.mkDerivation rec { pname = "atril"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "pTphOsuXAaGK1nG/WQJU0c6Da6CuG+LAvYlI/fa0kaQ="; + sha256 = "wwW51fVxP0Jiau4DggkTA0IrPXGlbd1lkyzNsjx86SY="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { gtk3 glib itstool + libarchive libsecret libxml2 poppler @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { texlive.bin.core # for synctex, used by the pdf back-end ] ++ lib.optionals enableDjvu [ djvulibre ] - ++ lib.optionals enableEpub [ webkitgtk ] + ++ lib.optionals enableEpub [ webkitgtk_4_1 ] ++ lib.optionals enablePostScript [ libspectre ] ++ lib.optionals enableXps [ libgxps ] ; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index a4f79e122122..a29cc7c18ec7 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.26.2"; + version = "1.26.3"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "vm2X3saPXza94S+KyvGsVkLSOaXSQWGoL/9QZPRQJUQ="; + sha256 = "WFthNBX3bucDt7XlK1WWKUKVB+A8kwVKSq3Pb5xlIkk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix new file mode 100644 index 000000000000..6395497fccda --- /dev/null +++ b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix @@ -0,0 +1,18 @@ +{ lib, mkXfceDerivation, gobject-introspection, glib, gtk3, libwnck, wayland }: + +mkXfceDerivation { + category = "xfce"; + pname = "libxfce4windowing"; + version = "4.19.2"; + + sha256 = "sha256-mXxxyfwZB/AJFVVGFAAXLqC5p7pZAeqmhljQym55hyM="; + + nativeBuildInputs = [ gobject-introspection ]; + buildInputs = [ glib gtk3 libwnck wayland ]; + + meta = { + description = "Windowing concept abstraction library for X11 and Wayland"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib; [ maintainers.federicoschonborn ] ++ teams.xfce.members; + }; +} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 94ca82b4388b..f0c53a4c3892 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -32,6 +32,8 @@ makeScopeWithSplicing' { libxfce4util = callPackage ./core/libxfce4util { }; + libxfce4windowing = callPackage ./core/libxfce4windowing { }; + thunar = callPackage ./core/thunar { thunarPlugins = [ ]; }; |