diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
commit | f34a1b70eb86e4a63cfb88ea460345bb1aed88e3 (patch) | |
tree | 32834d23912250e0c4b86aa4420baacf8091c0fe /nixpkgs/pkgs/desktops/gnome | |
parent | 003ab91dd67b093890db1dd0bab564345db6e496 (diff) | |
parent | 7a7cfff8915e06365bc2365ff33d4d413184fa9f (diff) | |
download | nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.gz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.bz2 nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.lz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.xz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.zst nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome')
15 files changed, 97 insertions, 187 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix b/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix index a2959626c837..f02f2e323e25 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix @@ -140,6 +140,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; + mainProgram = "evince"; maintainers = teams.gnome.members ++ teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix b/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix index f44278f896c3..25f9fe8c6340 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix @@ -5,7 +5,6 @@ , substituteAll , meson , ninja -, rsync , pkg-config , glib , itstool @@ -70,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - rsync gobject-introspection ]; @@ -131,33 +129,36 @@ stdenv.mkDerivation (finalAttrs: { ''; preInstall = '' - install -D ${override} $DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override + install -D ${override} "$DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override" ''; postInstall = '' # Move stuff from DESTDIR to proper location. - # We use rsync to merge the directories. - rsync --archive "$DESTDIR/etc" "$out" - rm --recursive "$DESTDIR/etc" for o in $(getAllOutputNames); do + # debug is created later by _separateDebugInfo hook. if [[ "$o" = "debug" ]]; then continue; fi - rsync --archive "$DESTDIR/''${!o}" "$(dirname "''${!o}")" - rm --recursive "$DESTDIR/''${!o}" + mv "$DESTDIR''${!o}" "$(dirname "''${!o}")" done - # Ensure the DESTDIR is removed. - rmdir "$DESTDIR/nix/store" "$DESTDIR/nix" "$DESTDIR" + + mv "$DESTDIR/etc" "$out" + + # Ensure we did not forget to install anything. + rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}" + ! test -e "$DESTDIR" # We are setting DESTDIR so the post-install script does not compile the schemas. glib-compile-schemas "$out/share/glib-2.0/schemas" ''; - # HACK: We want to install configuration files to $out/etc - # but GDM should read them from /etc on a NixOS system. - # With autotools, it was possible to override Make variables - # at install time but Meson does not support this - # so we need to convince it to install all files to a temporary - # location using DESTDIR and then move it to proper one in postInstall. - DESTDIR = "${placeholder "out"}/dest"; + env = { + # HACK: We want to install configuration files to $out/etc + # but GDM should read them from /etc on a NixOS system. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "dest"; + }; separateDebugInfo = true; diff --git a/nixpkgs/pkgs/desktops/gnome/default.nix b/nixpkgs/pkgs/desktops/gnome/default.nix index d356094942f3..0659e1fa5660 100644 --- a/nixpkgs/pkgs/desktops/gnome/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/default.nix @@ -260,18 +260,6 @@ lib.makeScope pkgs.newScope (self: with self; { }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. - empathy = throw "The ‘gnome.empathy’ package was removed as it is unmaintained and no longer launches due to libsoup3 migration."; # added 2023-01-20 - gedit = pkgs.gedit; # added 2023-07-05 - gnome-desktop = throw "The ‘gnome.gnome-desktop’ alias was removed. Please use ‘pkgs.gnome-desktop’ directly."; # converted to throw on 2022-10-26 - gnome-todo = pkgs.endeavour; # added 2022-07-30 - libgnome-games-support = throw "The ‘gnome.libgnome-games-support’ alias was removed. Please use ‘pkgs.libgnome-games-support’ directly."; # converted to throw on 2022-10-26 - - gnome-books = throw "The ‘gnome.gnome-books’ package was removed as it is broken and abandoned."; # added 2022-10-26 - gnome-documents = throw "The ‘gnome.gnome-documents’ package was removed as it is broken and abandoned."; # added 2022-10-26 - gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26 - - mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 - mutter42 = throw "The ‘gnome.mutter42’ package was removed as it is no longer needed by Pantheon."; # added 2023-03-23 - gnome-settings-daemon338 = throw "The ‘gnome.gnome-settings-daemon338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 - gnome-settings-daemon42 = throw "The ‘gnome.gnome-settings-daemon42’ package was removed as it is no longer needed by Pantheon."; # added 2023-03-23 + gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27 + gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27 } diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/argos/default.nix b/nixpkgs/pkgs/desktops/gnome/extensions/argos/default.nix index 83828b99b16d..cc12c5dc2015 100644 --- a/nixpkgs/pkgs/desktops/gnome/extensions/argos/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/extensions/argos/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, lib, stdenv }: stdenv.mkDerivation rec { - pname = "argos-unstable"; - version = "20230404"; + pname = "argos"; + version = "unstable-2023-09-26"; src = fetchFromGitHub { owner = "p-e-w"; repo = "argos"; - rev = "e2d68ea23eed081fccaec06c384e2c5d2acb5b6b"; - hash = "sha256-OJ/bUQkBQdlfEIqmneyUeIJoytTxyfibdyUDf3SJc0Q="; + rev = "adfaa31e8c08f7b59e9492891a7e6f753c29b35e"; # https://github.com/p-e-w/argos/pull/150 + hash = "sha256-st8AeMRtkvM4M/Z70qopjw9Yx0t9l0DsUke4ClQtcBU="; }; installPhase = '' diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix index abbeb15f7dcd..77b09d870509 100644 --- a/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -119,6 +119,16 @@ super: lib.trivial.pipe super [ ]; })) + (patchExtension "system-monitor-next@paradoxxx.zero.gmail.com" (old: { + patches = [ + (substituteAll { + src = ./extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch; + gtop_path = "${libgtop}/lib/girepository-1.0"; + }) + ]; + meta.maintainers = with lib.maintainers; [ andersk ]; + })) + (patchExtension "tophat@fflewddur.github.io" (old: { patches = [ (substituteAll { diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch b/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch new file mode 100644 index 000000000000..19eedbf27a98 --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch @@ -0,0 +1,30 @@ +diff --git a/extension.js b/extension.js +index ee8c3a9..ca72885 100644 +--- a/extension.js ++++ b/extension.js +@@ -21,6 +21,7 @@ + import { Extension, gettext as _ } from "resource:///org/gnome/shell/extensions/extension.js"; + + import Clutter from "gi://Clutter"; ++import GIRepository from "gi://GIRepository"; + import GLib from "gi://GLib"; + import GObject from "gi://GObject"; + +@@ -28,7 +29,6 @@ import Gio from "gi://Gio"; + import Shell from "gi://Shell"; + import St from "gi://St"; + import UPowerGlib from "gi://UPowerGlib"; +-import GTop from "gi://GTop"; + import NM from "gi://NM"; + + import * as ModalDialog from "resource:///org/gnome/shell/ui/modalDialog.js"; +@@ -41,6 +41,9 @@ import * as PopupMenu from "resource:///org/gnome/shell/ui/popupMenu.js"; + + import * as Util from "resource:///org/gnome/shell/misc/util.js"; + ++GIRepository.Repository.prepend_search_path('@gtop_path@'); ++const GTop = (await import("gi://GTop")).default; ++ + const NetworkManager = NM; + const UPower = UPowerGlib; + // Copied as of https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/5fa08fe53376f5dca755360bd005a4a51ca78917/js/ui/panel.js#L45 diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix b/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix index 3339126dc4dc..28bc635a7ad4 100644 --- a/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -88,7 +88,6 @@ # ####### GNOME 40 ####### - "system-monitor@paradoxxx.zero.gmail.com" = "system-monitor"; # manually packaged "System_Monitor@bghome.gmail.com" = "system-monitor-2"; "Hide_Activities@shay.shayel.org" = "hide-activities-button"; diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json b/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json index 3182c9e47b33..7b2abf6d2ee5 100644 --- a/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json +++ b/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json @@ -2184,7 +2184,7 @@ "42": {"version": "55", "sha256": "0fwxj41ka95mxrjy3xbywqxm0fp00irypkwcg316pyy9cva4rk01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLCBvY2Nhc2lvbmFsbHkgaW5jbHVkaW5nIHBhdGNoZXMgdGhhdCBoYXZlbid0IHlldCBtZXJnZWQgdXBzdHJlYW0uXG5cblRoaXMgaXMgcHJlZmVyYWJsZSBmb3IgdXNlcnMgb24gYmxlZWRpbmcgZWRnZSBkaXN0cmlidXRpb25zIHRoYXQgcHJlZmVyIG5vdCB0byB3YWl0IGZvciBhIHN0YWJsZSByZWxlYXNlIGZyb20gdGhlIG1haW4gcmVwby4gT2YgY291cnNlLCBzaW5jZSB3ZSdyZSByZWxlYXNpbmcgZGlyZWN0bHkgZnJvbSBtYXN0ZXIgc29tZSBpbnN0YWJpbGl0eSBpcyBpbmV2aXRhYmxlLlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgcmVzdGFydGluZyBHbm9tZSBTaGVsbCB3aXRoIEFsdC1GMiB0aGVuICdyJy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="}, "43": {"version": "55", "sha256": "0fwxj41ka95mxrjy3xbywqxm0fp00irypkwcg316pyy9cva4rk01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLCBvY2Nhc2lvbmFsbHkgaW5jbHVkaW5nIHBhdGNoZXMgdGhhdCBoYXZlbid0IHlldCBtZXJnZWQgdXBzdHJlYW0uXG5cblRoaXMgaXMgcHJlZmVyYWJsZSBmb3IgdXNlcnMgb24gYmxlZWRpbmcgZWRnZSBkaXN0cmlidXRpb25zIHRoYXQgcHJlZmVyIG5vdCB0byB3YWl0IGZvciBhIHN0YWJsZSByZWxlYXNlIGZyb20gdGhlIG1haW4gcmVwby4gT2YgY291cnNlLCBzaW5jZSB3ZSdyZSByZWxlYXNpbmcgZGlyZWN0bHkgZnJvbSBtYXN0ZXIgc29tZSBpbnN0YWJpbGl0eSBpcyBpbmV2aXRhYmxlLlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgcmVzdGFydGluZyBHbm9tZSBTaGVsbCB3aXRoIEFsdC1GMiB0aGVuICdyJy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="}, "44": {"version": "55", "sha256": "0fwxj41ka95mxrjy3xbywqxm0fp00irypkwcg316pyy9cva4rk01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLCBvY2Nhc2lvbmFsbHkgaW5jbHVkaW5nIHBhdGNoZXMgdGhhdCBoYXZlbid0IHlldCBtZXJnZWQgdXBzdHJlYW0uXG5cblRoaXMgaXMgcHJlZmVyYWJsZSBmb3IgdXNlcnMgb24gYmxlZWRpbmcgZWRnZSBkaXN0cmlidXRpb25zIHRoYXQgcHJlZmVyIG5vdCB0byB3YWl0IGZvciBhIHN0YWJsZSByZWxlYXNlIGZyb20gdGhlIG1haW4gcmVwby4gT2YgY291cnNlLCBzaW5jZSB3ZSdyZSByZWxlYXNpbmcgZGlyZWN0bHkgZnJvbSBtYXN0ZXIgc29tZSBpbnN0YWJpbGl0eSBpcyBpbmV2aXRhYmxlLlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgcmVzdGFydGluZyBHbm9tZSBTaGVsbCB3aXRoIEFsdC1GMiB0aGVuICdyJy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="}, - "45": {"version": "63", "sha256": "1wdskkx0afb3ajmb0742wifybvz1nj17irqychs7r0v393b2jfx3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgaXMgYSBmb3JrIG9mIHRoZSBzZWVtaW5nbHkgYWJhbmRvbmVkIHBhcmFkb3h4eHplcm8vZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0LlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgbG9nZ2luZyBvdXQgYW5kIGxvZ2dpbmcgYmFjayBpbiAodGhpcyBpcyBhIGtub3duIGlzc3VlIHRoYXQgaXMgYmVpbmcgd29ya2VkIG9uKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZ2FsZ3MvZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0IiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvci1uZXh0QHBhcmFkb3h4eC56ZXJvLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Mwp9"} + "45": {"version": "64", "sha256": "1sx2jrwclqx8jsn60bj9gi0xllnwvrix9jc5wfx4qzv210is5g1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgaXMgYSBmb3JrIG9mIHRoZSBzZWVtaW5nbHkgYWJhbmRvbmVkIHBhcmFkb3h4eHplcm8vZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0LlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgbG9nZ2luZyBvdXQgYW5kIGxvZ2dpbmcgYmFjayBpbiAodGhpcyBpcyBhIGtub3duIGlzc3VlIHRoYXQgaXMgYmVpbmcgd29ya2VkIG9uKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZ2FsZ3MvZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0IiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvci1uZXh0QHBhcmFkb3h4eC56ZXJvLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2NAp9"} }} , {"uuid": "user-theme-x@tuberry.github.io", "name": "User Theme X", "pname": "user-themes-x", "description": "Customizable user-theme with user stylesheet and dark theme auto-switch based on the Night Light\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3019/user-themes-x/", "shell_version_map": { "38": {"version": "21", "sha256": "0qiahmg2nmrnlyablyava1488rvy0r2rq8pyv932lsx6vrn9gh6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJleHRlbnNpb24taWQiOiAidXNlci10aGVtZS14IiwKICAiZ2V0dGV4dC1kb21haW4iOiAidXNlci10aGVtZS14IiwKICAibmFtZSI6ICJVc2VyIFRoZW1lIFgiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3VzZXItdGhlbWUteCIsCiAgInV1aWQiOiAidXNlci10aGVtZS14QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIxCn0="}, diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index e1e40ec10593..c0dc65bb3fa6 100644 --- a/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -12,7 +12,6 @@ "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; "pop-shell@system76.com" = callPackage ./pop-shell { }; "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; - "system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { }; "taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { }; "tilingnome@rliang.github.com" = callPackage ./tilingnome { }; "TopIcons@phocean.net" = callPackage ./topicons-plus { }; diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/nixpkgs/pkgs/desktops/gnome/extensions/system-monitor/default.nix deleted file mode 100644 index 7295e2e392a4..000000000000 --- a/nixpkgs/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, fetchpatch, glib, glib-networking, libgtop, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-system-monitor"; - version = "unstable-2023-01-21"; - - src = fetchFromGitHub { - owner = "paradoxxxzero"; - repo = "gnome-shell-system-monitor-applet"; - rev = "21d7b4e7a03ec8145b0b90c4f0b15c27d6f53788"; - hash = "sha256-XDqWxTyaFEWPdXMTklcNQxqql73ESXAIF6TjMFHaj7g="; - }; - - nativeBuildInputs = [ - glib - gnome.gnome-shell - ]; - - patches = [ - # GNOME 44 compatibility - (fetchpatch { - url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/788/commits/e69349942791140807c01d472dfe5e0ddf5c73c0.patch"; - hash = "sha256-g5Ocpvp7eO/pBkDBZsxgXH7e8rdPBUUxDSwK2hJHKbY="; - }) - (substituteAll { - src = ./paths_and_nonexisting_dirs.patch; - clutter_path = gnome.mutter.libdir; # only needed for GNOME < 40. - gtop_path = "${libgtop}/lib/girepository-1.0"; - glib_net_path = "${glib-networking}/lib/girepository-1.0"; - }) - ]; - - makeFlags = [ - "VERSION=${version}" - "INSTALLBASE=$(out)/share/gnome-shell/extensions" - "SUDO=" - ]; - - passthru = { - extensionUuid = "system-monitor@paradoxxx.zero.gmail.com"; - extensionPortalSlug = "system-monitor"; - }; - - meta = with lib; { - description = "Display system informations in gnome shell status bar"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ andersk ]; - homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet"; - }; -} diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/nixpkgs/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch deleted file mode 100644 index 280af965af3f..000000000000 --- a/nixpkgs/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js -index de5e3d7..2d7824d 100644 ---- a/system-monitor@paradoxxx.zero.gmail.com/extension.js -+++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js -@@ -18,6 +18,9 @@ - - // Author: Florian Mounier aka paradoxxxzero - -+imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); -+imports.gi.GIRepository.Repository.prepend_search_path('@glib_net_path@'); -+ - /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily - * by loading the new libnm.so. Should go away eventually */ - -@@ -407,7 +410,7 @@ const smMountsMonitor = class SystemMonitor_smMountsMonitor { - this.connected = false; - - this._volumeMonitor = Gio.VolumeMonitor.get(); -- let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local']; -+ let sys_mounts = ['/home', '/tmp', '/boot']; - this.base_mounts = ['/']; - sys_mounts.forEach((sMount) => { - if (this.is_sys_mount(sMount + '/')) { -diff --git a/system-monitor@paradoxxx.zero.gmail.com/prefs.js b/system-monitor@paradoxxx.zero.gmail.com/prefs.js -index 81d667c..0da4809 100644 ---- a/system-monitor@paradoxxx.zero.gmail.com/prefs.js -+++ b/system-monitor@paradoxxx.zero.gmail.com/prefs.js -@@ -1,3 +1,5 @@ -+imports.gi.GIRepository.Repository.prepend_search_path('@clutter_path@'); -+ - const Gtk = imports.gi.Gtk; - const Gio = imports.gi.Gio; - const Gdk = imports.gi.Gdk; diff --git a/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix b/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix index 741006bdec19..30812f940071 100644 --- a/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix @@ -3,30 +3,28 @@ , fetchurl , pkg-config , gnome -, gtk3 -, wrapGAppsHook +, gtk4 +, wrapGAppsHook4 , librsvg , gsound -, clutter-gtk , gettext , itstool , vala , libxml2 , libgee -, libgnome-games-support +, libgnome-games-support_2_0 , meson , ninja , desktop-file-utils -, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-nibbles"; - version = "3.38.3"; + version = "4.0.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "l1/eHYPHsVs5Lqx6NZFhKQ/IrrdgXBHnHO4MPDJrXmE="; + url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz"; + sha256 = "xrG89vesx0RQAmveV7OONcJJ08K3xC2c/hH4YvPW12I="; }; nativeBuildInputs = [ @@ -34,22 +32,19 @@ stdenv.mkDerivation rec { ninja vala pkg-config - wrapGAppsHook + wrapGAppsHook4 gettext itstool libxml2 desktop-file-utils - hicolor-icon-theme ]; buildInputs = [ - gtk3 + gtk4 librsvg gsound - clutter-gtk - gnome.adwaita-icon-theme libgee - libgnome-games-support + libgnome-games-support_2_0 ]; passthru = { @@ -62,8 +57,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Guide a worm around a maze"; homepage = "https://wiki.gnome.org/Apps/Nibbles"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix b/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix index 2051f19a37be..2f66d742f969 100644 --- a/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -35,10 +35,6 @@ stdenv.mkDerivation rec { # TODO: switch to substituteAll with placeholder # https://github.com/NixOS/nix/issues/1846 postPatch = '' - substituteInPlace src/gnome-shell/extension.js \ - --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" - substituteInPlace src/gnome-shell/prefs.js \ - --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \ --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"} ''; @@ -69,6 +65,20 @@ stdenv.mkDerivation rec { "-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user" ]; + postInstall = '' + # We do not have central location to install typelibs to, + # let’s ensure GNOME Shell can still find them. + extensionDir="$out/share/gnome-shell/extensions/GPaste@gnome-shell-extensions.gnome.org" + mv "$extensionDir/"{extension,.extension-wrapped}.js + mv "$extensionDir/"{prefs,.prefs-wrapped}.js + substitute "${./wrapper.js}" "$extensionDir/extension.js" \ + --subst-var-by originalName "extension" \ + --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" + substitute "${./wrapper.js}" "$extensionDir/prefs.js" \ + --subst-var-by originalName "prefs" \ + --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" + ''; + meta = with lib; { homepage = "https://github.com/Keruspe/GPaste"; description = "Clipboard management system with GNOME 3 integration"; diff --git a/nixpkgs/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch index ef782ce374a8..ebebc8a20bd6 100644 --- a/nixpkgs/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch +++ b/nixpkgs/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch @@ -1,48 +1,3 @@ -diff --git a/src/gnome-shell/__nix-prepend-search-paths.js b/src/gnome-shell/__nix-prepend-search-paths.js -new file mode 100644 -index 00000000..e8e20c67 ---- /dev/null -+++ b/src/gnome-shell/__nix-prepend-search-paths.js -@@ -0,0 +1,3 @@ -+import GIRepository from 'gi://GIRepository'; -+ -+GIRepository.Repository.prepend_search_path('@typelibDir@'); -diff --git a/src/gnome-shell/extension.js b/src/gnome-shell/extension.js -index cb862a30..980767c9 100644 ---- a/src/gnome-shell/extension.js -+++ b/src/gnome-shell/extension.js -@@ -4,6 +4,8 @@ - * Copyright (c) 2010-2023, Marc-Antoine Perennou <Marc-Antoine@Perennou.com> - */ - -+import './__nix-prepend-search-paths.js'; -+ - import * as Main from 'resource:///org/gnome/shell/ui/main.js'; - import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js'; - -diff --git a/src/gnome-shell/meson.build b/src/gnome-shell/meson.build -index 86cbb0b2..80fc4d67 100644 ---- a/src/gnome-shell/meson.build -+++ b/src/gnome-shell/meson.build -@@ -1,4 +1,5 @@ - shell_extension_files = [ -+ '__nix-prepend-search-paths.js', - 'aboutItem.js', - 'actionButton.js', - 'actionButtonActor.js', -diff --git a/src/gnome-shell/prefs.js b/src/gnome-shell/prefs.js -index 4c0d9bde..58f54f9a 100644 ---- a/src/gnome-shell/prefs.js -+++ b/src/gnome-shell/prefs.js -@@ -4,6 +4,8 @@ - * Copyright (c) 2010-2023, Marc-Antoine Perennou <Marc-Antoine@Perennou.com> - */ - -+import './__nix-prepend-search-paths.js'; -+ - import { ExtensionPreferences, gettext as _ } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js'; - - import GPasteGtk from 'gi://GPasteGtk?version=4'; diff --git a/src/libgpaste/gpaste/gpaste-settings.c b/src/libgpaste/gpaste/gpaste-settings.c index 830f5e0b..c8df0e11 100644 --- a/src/libgpaste/gpaste/gpaste-settings.c diff --git a/nixpkgs/pkgs/desktops/gnome/misc/gpaste/wrapper.js b/nixpkgs/pkgs/desktops/gnome/misc/gpaste/wrapper.js new file mode 100644 index 000000000000..ea6a9cba6f6f --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome/misc/gpaste/wrapper.js @@ -0,0 +1,5 @@ +import GIRepository from 'gi://GIRepository'; + +GIRepository.Repository.prepend_search_path('@typelibDir@'); + +export default (await import('./.@originalName@-wrapped.js')).default; |