From be91726358a412da3503c8cadffd2eeec67df439 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 27 Jul 2022 12:05:17 +0800 Subject: treewide: rename cinnamon.xapps to cinnamon.xapp https://github.com/linuxmint/xapps redirects to https://github.com/linuxmint/xapp, and the meson project name is xapp. --- .../services/x11/desktop-managers/cinnamon.nix | 4 +- pkgs/applications/backup/timeshift/unwrapped.nix | 4 +- pkgs/applications/editors/xed-editor/default.nix | 4 +- pkgs/applications/misc/sticky/default.nix | 2 +- pkgs/applications/video/hypnotix/default.nix | 2 +- pkgs/applications/video/xplayer/default.nix | 4 +- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 23 ++++- .../cinnamon-gsettings-overrides/default.nix | 4 +- .../cinnamon/cinnamon-screensaver/default.nix | 11 ++- .../desktops/cinnamon/cinnamon-session/default.nix | 4 +- pkgs/desktops/cinnamon/cjs/default.nix | 4 +- pkgs/desktops/cinnamon/default.nix | 9 +- pkgs/desktops/cinnamon/nemo/default.nix | 4 +- pkgs/desktops/cinnamon/pix/default.nix | 4 +- pkgs/desktops/cinnamon/xapp/default.nix | 105 +++++++++++++++++++++ pkgs/desktops/cinnamon/xapps/default.nix | 105 --------------------- pkgs/desktops/cinnamon/xreader/default.nix | 4 +- pkgs/desktops/cinnamon/xviewer/default.nix | 4 +- pkgs/development/python-modules/xapp/default.nix | 4 +- pkgs/tools/bluetooth/blueberry/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +- pkgs/top-level/python-packages.nix | 2 +- 22 files changed, 168 insertions(+), 147 deletions(-) create mode 100644 pkgs/desktops/cinnamon/xapp/default.nix delete mode 100644 pkgs/desktops/cinnamon/xapps/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 3317c58bb522..b6d9595772ed 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -92,7 +92,7 @@ in cinnamon-common cinnamon-screensaver nemo - xapps + xapp ]; services.cinnamon.apps.enable = mkDefault true; services.gnome.glib-networking.enable = true; @@ -202,7 +202,7 @@ in bulky warpinator - # cinnamon xapps + # cinnamon xapp xviewer xreader xed-editor diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 7f27a0d6ca1b..61964370b3e2 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -10,7 +10,7 @@ , libgee , util-linux , vte -, xapps +, xapp }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { json-glib libgee vte - xapps + xapp ]; preBuild = '' diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 834130af12b4..0cbca2ea2bde 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -7,7 +7,7 @@ , gtk3 , gtksourceview4 , gspell -, xapps +, xapp , pkg-config , python3 , meson @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { gtksourceview4 libpeas gspell - xapps + xapp ]; doInstallCheck = true; diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index b9d12066affd..a66fecd83b76 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib gobject-introspection - cinnamon.xapps + cinnamon.xapp gspell ]; diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index b65f41d9a96d..af6d9fe702c4 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; buildInputs = [ - cinnamon.xapps + cinnamon.xapp ]; pythonPath = with python3.pkgs; [ diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index a18b5311f5ba..3bbbb115fbea 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -22,7 +22,7 @@ , pkg-config , python3 , wrapGAppsHook -, xapps +, xapp , yelp-tools }: let @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { libxml2 libxplayer-plparser pythonenv - xapps + xapp # to satisfy configure script pythonenv.pkgs.pygobject3 ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 133f404ee9ed..87d500cf617b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -35,7 +35,7 @@ , python3 , keybinder3 , cairo -, xapps +, xapp , upower , nemo , libnotify @@ -68,7 +68,20 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro requests ])) + (python3.withPackages (pp: with pp; [ + dbus-python + setproctitle + pygobject3 + pycairo + python3.pkgs.xapp # The scope prefix is required + pillow + pytz + tinycss2 + python-pam + pexpect + distro + requests + ])) atk cacert cinnamon-control-center @@ -99,7 +112,7 @@ stdenv.mkDerivation rec { gnome.caribou keybinder3 upower - xapps + xapp timezonemap nemo libnotify @@ -134,8 +147,8 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py - sed "s|/usr/bin/upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py - sed "s|upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|/usr/bin/upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings # this one really IS optional diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 3066d7fcd807..a3456755045f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -10,7 +10,7 @@ , muffin , nemo -, xapps +, xapp , cinnamon-desktop , cinnamon-session , cinnamon-settings-daemon @@ -28,7 +28,7 @@ let bulky muffin nemo - xapps + xapp cinnamon-desktop cinnamon-session cinnamon-settings-daemon diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 6afc85420649..23be4175ab6d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -22,7 +22,7 @@ , pam , accountsservice , cairo -, xapps +, xapp , xdotool , xorg , iso-flags-png-320x420 @@ -71,8 +71,13 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXrandr - (python3.withPackages (pp: with pp; [ pygobject3 setproctitle xapp pycairo ])) - xapps + (python3.withPackages (pp: with pp; [ + pygobject3 + setproctitle + python3.pkgs.xapp # The scope prefix is required + pycairo + ])) + xapp xdotool pam accountsservice diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 56fc8fb04b8a..261433e65872 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -17,7 +17,7 @@ , stdenv , systemd , wrapGAppsHook -, xapps +, xapp , xorg , libexecinfo , pango @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pango xorg.libX11 xorg.libXext - xapps + xapp xorg.libXau xorg.libXcomposite diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index b7ebd86afc24..74b105381836 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -8,7 +8,7 @@ , python3 , cairo , gnome -, xapps +, xapp , keybinder3 , upower , callPackage @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { gnome.caribou keybinder3 upower - xapps + xapp ]; mesonFlags = [ diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 7f9d332ed140..5a803c6d487c 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ config, pkgs, lib }: lib.makeScope pkgs.newScope (self: with self; { iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // { @@ -31,8 +31,11 @@ lib.makeScope pkgs.newScope (self: with self; { mint-y-icons = callPackage ./mint-y-icons { }; muffin = callPackage ./muffin { }; pix = callPackage ./pix { }; - xapps = callPackage ./xapps { }; + xapp = callPackage ./xapp { }; warpinator = callPackage ./warpinator { }; xreader = callPackage ./xreader { }; xviewer = callPackage ./xviewer { }; -}) +}) // lib.optionalAttrs config.allowAliases { + # Aliases need to be outside the scope or they will shadow the attributes from parent scope. + xapps = pkgs.cinnamon.xapp; # added 2022-07-27 +} diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 75db6308287f..4b013050ad84 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -12,7 +12,7 @@ , gtk3 , gvfs , cinnamon-desktop -, xapps +, xapp , libexif , exempi , intltool @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { gtk3 cinnamon-desktop libxml2 - xapps + xapp libexif exempi gvfs diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index 3193efb958cb..ebd116882a8c 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -16,7 +16,7 @@ , pkg-config , shared-mime-info , wrapGAppsHook -, xapps +, xapp , yelp-tools , libsecret , webkitgtk @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - xapps + xapp libsecret webkitgtk libwebp diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix new file mode 100644 index 000000000000..655284f20d82 --- /dev/null +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -0,0 +1,105 @@ +{ fetchFromGitHub +, fetchpatch +, glib +, gobject-introspection +, gtk3 +, libgnomekbd +, gdk-pixbuf +, cairo +, xorg +, meson +, ninja +, pkg-config +, python3 +, lib +, stdenv +, vala +, wrapGAppsHook +, inxi +, mate +, dbus +, libdbusmenu-gtk3 +}: + +stdenv.mkDerivation rec { + pname = "xapp"; + version = "2.2.14"; + + outputs = [ "out" "dev" ]; + + patches = [ + # Add missing gio-unix-2.0 dependency, can be removed on next update + # https://github.com/linuxmint/xapp/pull/156 + (fetchpatch { + url = "https://github.com/linuxmint/xapp/commit/052081f75d1c1212aeb6a913772723c81607bcb3.patch"; + sha256 = "sha256-VL70Y1FIa7lQ/zKjEx0GhaU1QRu4z6Yu400/bDbgZgM="; + }) + ]; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + hash = "sha256-BebsS7y/hRQSc4rYOIWJ+sSJ5fLZaCpNAE48JnviUUc="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + (python3.withPackages (ps: with ps; [ + pygobject3 + setproctitle # mate applet + ])) + libgnomekbd + gdk-pixbuf + xorg.libxkbfile + python3.pkgs.pygobject3 # for .pc file + mate.mate-panel # for gobject-introspection + dbus + libdbusmenu-gtk3 + ]; + + # Requires in xapp.pc + propagatedBuildInputs = [ + gtk3 + cairo + glib + ]; + + mesonFlags = [ + "-Dpy-overrides-dir=${placeholder "out"}/${python3.sitePackages}/gi/overrides" + ]; + + postPatch = '' + chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file + + patchShebangs \ + libxapp/g-codegen.py \ + meson-scripts/g-codegen.py \ + schemas/meson_install_schemas.py + + # Patch pastebin & inxi location + sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info + sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info + + # Patch gtk3 module target dir + substituteInPlace libxapp/meson.build \ + --replace "gtk3_dep.get_pkgconfig_variable('libdir')" "'$out'" + ''; + + meta = with lib; { + homepage = "https://github.com/linuxmint/xapp"; + description = "Cross-desktop libraries and common resources"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = teams.cinnamon.members; + }; +} diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix deleted file mode 100644 index 60a0e0aea70e..000000000000 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ fetchFromGitHub -, fetchpatch -, glib -, gobject-introspection -, gtk3 -, libgnomekbd -, gdk-pixbuf -, cairo -, xorg -, meson -, ninja -, pkg-config -, python3 -, lib -, stdenv -, vala -, wrapGAppsHook -, inxi -, mate -, dbus -, libdbusmenu-gtk3 -}: - -stdenv.mkDerivation rec { - pname = "xapps"; - version = "2.2.14"; - - outputs = [ "out" "dev" ]; - - patches = [ - # Add missing gio-unix-2.0 dependency, can be removed on next update - # https://github.com/linuxmint/xapp/pull/156 - (fetchpatch { - url = "https://github.com/linuxmint/xapp/commit/052081f75d1c1212aeb6a913772723c81607bcb3.patch"; - sha256 = "sha256-VL70Y1FIa7lQ/zKjEx0GhaU1QRu4z6Yu400/bDbgZgM="; - }) - ]; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-BebsS7y/hRQSc4rYOIWJ+sSJ5fLZaCpNAE48JnviUUc="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook - ]; - - buildInputs = [ - gobject-introspection - (python3.withPackages (ps: with ps; [ - pygobject3 - setproctitle # mate applet - ])) - libgnomekbd - gdk-pixbuf - xorg.libxkbfile - python3.pkgs.pygobject3 # for .pc file - mate.mate-panel # for gobject-introspection - dbus - libdbusmenu-gtk3 - ]; - - # Requires in xapp.pc - propagatedBuildInputs = [ - gtk3 - cairo - glib - ]; - - mesonFlags = [ - "-Dpy-overrides-dir=${placeholder "out"}/${python3.sitePackages}/gi/overrides" - ]; - - postPatch = '' - chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file - - patchShebangs \ - libxapp/g-codegen.py \ - meson-scripts/g-codegen.py \ - schemas/meson_install_schemas.py - - # Patch pastebin & inxi location - sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info - sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info - - # Patch gtk3 module target dir - substituteInPlace libxapp/meson.build \ - --replace "gtk3_dep.get_pkgconfig_variable('libdir')" "'$out'" - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/xapps"; - description = "Cross-desktop libraries and common resources"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index 043b730ec765..67983d505694 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -8,7 +8,7 @@ , gtk3 , wrapGAppsHook , libxml2 -, xapps +, xapp , meson , pkg-config , cairo @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - xapps + xapp cairo libxml2 libsecret diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index d7c7ef638db5..c0dc50182c01 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -21,7 +21,7 @@ , pkg-config , python3 , wrapGAppsHook -, xapps +, xapp , yelp-tools }: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { libpeas librsvg libxml2 - xapps + xapp ]; meta = with lib; { diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index b847132f34d7..ba48de4de7e1 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -5,7 +5,7 @@ , pygobject3 , gtk3 , gobject-introspection -, xapps +, xapp , polkit }: @@ -25,7 +25,7 @@ buildPythonPackage rec { pygobject3 gtk3 gobject-introspection - xapps + xapp polkit ]; diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 3954d3f5cd9b..9208e286c9b4 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools - cinnamon.xapps + cinnamon.xapp gnome.gnome-bluetooth_1_0 python3Packages.python util-linux diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49772490ff0f..15de4f465454 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30637,7 +30637,7 @@ with pkgs; timelimit = callPackage ../tools/misc/timelimit { }; - timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapps; }; + timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapp; }; timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2_full; }; @@ -31383,7 +31383,7 @@ with pkgs; xdotool = callPackage ../tools/X11/xdotool { }; xed-editor = callPackage ../applications/editors/xed-editor { - xapps = cinnamon.xapps; + xapp = cinnamon.xapp; }; xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); @@ -31493,7 +31493,7 @@ with pkgs; xplayer = callPackage ../applications/video/xplayer { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; - inherit (cinnamon) xapps; + inherit (cinnamon) xapp; }; libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f430c6bb183..53574ad1b6eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11448,7 +11448,7 @@ in { xapp = callPackage ../development/python-modules/xapp { inherit (pkgs) gtk3 gobject-introspection polkit; - inherit (pkgs.cinnamon) xapps; + inherit (pkgs.cinnamon) xapp; }; xarray = callPackage ../development/python-modules/xarray { }; -- cgit 1.4.1