Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions pkgs/desktops/gnome/extensions/collisions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"activitywatch-status": [
"activitywatch-status@cweiske.de",
"aw-status@brayo.dev"
],
"applications-menu": [
"Applications_Menu@rmy.pobox.com",
"apps-menu@gnome-shell-extensions.gcampax.github.com"
Expand All @@ -12,14 +16,14 @@
"eur-usd-gshell@vezza.github.com",
"usd-mxn-gshell@kinduff.github.com"
],
"fullscreen-to-empty-workspace": [
"fullscreen-to-empty-workspace2@corgijan.dev",
"fullscreen-to-empty-workspace@aiono.dev"
],
"fuzzy-clock": [
"FuzzyClock@fire-man-x",
"FuzzyClock@johngoetz"
],
"lock-keys": [
"lockkeys@febueldo.test",
"lockkeys@vaina.lt"
],
"mouse-follows-focus": [
"mouse-follows-focus@crisidev.org",
"mousefollowsfocus@matthes.biz"
Expand All @@ -32,12 +36,9 @@
"PersianCalendar@oxygenws.com",
"persian-calendar@iamrezamousavi.gmail.com"
],
"power-profile-indicator": [
"power-profile-indicator@laux.wtf",
"power-profile@fthx"
],
"system-monitor": [
"System_Monitor@bghome.gmail.com",
"system-monitor@axet.github.com",
"system-monitor@gnome-shell-extensions.gcampax.github.com"
]
}
3 changes: 2 additions & 1 deletion pkgs/desktops/gnome/extensions/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ rec {
gnome46Extensions = mapUuidNames (produceExtensionsList "46");
gnome47Extensions = mapUuidNames (produceExtensionsList "47");
gnome48Extensions = mapUuidNames (produceExtensionsList "48");
gnome49Extensions = mapUuidNames (produceExtensionsList "49");

# Keep the last three versions in here
gnomeExtensions = lib.trivial.pipe (gnome46Extensions // gnome47Extensions // gnome48Extensions) [
gnomeExtensions = lib.trivial.pipe (gnome47Extensions // gnome48Extensions // gnome49Extensions) [
# Apply some custom patches for automatically packaged extensions
(callPackage ./extensionOverrides.nix { })
# Add all manually packaged extensions
Expand Down
10 changes: 0 additions & 10 deletions pkgs/desktops/gnome/extensions/extensionOverrides.nix
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,6 @@ lib.trivial.pipe super [
];
}))

(patchExtension "gnome-shell-screenshot@ttll.de" (old: {
# Requires gjs
# https://github.com/NixOS/nixpkgs/issues/136112
postPatch = ''
for file in *.js; do
substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs"
done
'';
}))

(patchExtension "gtk4-ding@smedius.gitlab.com" (old: {
nativeBuildInputs = [ wrapGAppsHook3 ];
patches = [
Expand Down
Loading
Loading