diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index df776b87de2f..b1c762a018f4 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -3,8 +3,15 @@ , gjs , gnome , gobject-introspection +, hddtemp +, liquidctl +, lm_sensors +, netcat-gnu +, nvme-cli +, procps , pulseaudio , python3 +, smartmontools , substituteAll , touchegg , vte @@ -51,6 +58,17 @@ super: lib.trivial.pipe super [ ''; })) + (patchExtension "freon@UshakovVasilii_Github.yahoo.com" (old: { + patches = [ + (substituteAll { + src = ./extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch; + inherit hddtemp liquidctl lm_sensors procps smartmontools; + netcat = netcat-gnu; + nvmecli = nvme-cli; + }) + ]; + })) + (patchExtension "gnome-shell-screenshot@ttll.de" (old: { # Requires gjs # https://github.com/NixOS/nixpkgs/issues/136112 diff --git a/pkgs/desktops/gnome/extensions/freon/fix_paths.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch similarity index 71% rename from pkgs/desktops/gnome/extensions/freon/fix_paths.patch rename to pkgs/desktops/gnome/extensions/extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch index 8efd22dc6df0..da2e940ba017 100644 --- a/pkgs/desktops/gnome/extensions/freon/fix_paths.patch +++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch @@ -1,7 +1,7 @@ -diff --git a/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js b/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js +diff --git a/hddtempUtil.js b/hddtempUtil.js index e5d1d6d..856654b 100644 ---- a/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js -+++ b/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js +--- a/hddtempUtil.js ++++ b/hddtempUtil.js @@ -7,7 +7,7 @@ var HddtempUtil = class extends CommandLineUtil.CommandLineUtil { constructor() { @@ -31,10 +31,10 @@ index e5d1d6d..856654b 100644 if(output.length) pid = Number(output.trim()); } -diff --git a/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js b/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js +diff --git a/liquidctlUtil.js b/liquidctlUtil.js index 766bf62..7cd4e94 100644 ---- a/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js -+++ b/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js +--- a/liquidctlUtil.js ++++ b/liquidctlUtil.js @@ -8,7 +8,7 @@ const commandLineUtil = Me.imports.commandLineUtil; var LiquidctlUtil = class extends commandLineUtil.CommandLineUtil { constructor() { @@ -44,10 +44,10 @@ index 766bf62..7cd4e94 100644 this._argv = path ? [path, 'status', '--json'] : null; } -diff --git a/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js b/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js +diff --git a/nvmecliUtil.js b/nvmecliUtil.js index ae2ea93..2349b9e 100644 ---- a/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js -+++ b/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js +--- a/nvmecliUtil.js ++++ b/nvmecliUtil.js @@ -3,7 +3,7 @@ const GLib = imports.gi.GLib; const Me = imports.misc.extensionUtils.getCurrentExtension(); @@ -57,10 +57,10 @@ index ae2ea93..2349b9e 100644 return JSON.parse(GLib.spawn_command_line_sync(`${nvme} ${argv} -o json`)[1].toString()) } -diff --git a/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js b/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js +diff --git a/sensorsUtil.js b/sensorsUtil.js index 62fa580..c017748 100644 ---- a/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js -+++ b/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js +--- a/sensorsUtil.js ++++ b/sensorsUtil.js @@ -7,7 +7,7 @@ var SensorsUtil = class extends CommandLineUtil.CommandLineUtil { constructor() { @@ -70,16 +70,16 @@ index 62fa580..c017748 100644 // -A: Do not show adapter -j: JSON output this._argv = path ? [path, '-A', '-j'] : null; } -diff --git a/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js b/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js +diff --git a/smartctlUtil.js b/smartctlUtil.js index 03d469b..6057a3b 100644 ---- a/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js -+++ b/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js +--- a/smartctlUtil.js ++++ b/smartctlUtil.js @@ -3,7 +3,7 @@ const GLib = imports.gi.GLib; const Me = imports.misc.extensionUtils.getCurrentExtension(); const ByteArray = imports.byteArray; function getSmartData (argv){ - const smartctl = GLib.find_program_in_path('smartctl') + const smartctl = GLib.find_program_in_path('@smartmontools@/bin/smartctl') - return JSON.parse(ByteArray.toString( GLib.spawn_command_line_sync(`'${smartctl}' ${argv} -j`)[1] )) + return JSON.parse(ByteArray.toString( GLib.spawn_command_line_sync(`${smartctl} ${argv} -j`)[1] )) } diff --git a/pkgs/desktops/gnome/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix deleted file mode 100644 index f57330dee559..000000000000 --- a/pkgs/desktops/gnome/extensions/freon/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, glib -, substituteAll -, hddtemp -, liquidctl -, lm_sensors -, netcat-gnu -, nvme-cli -, procps -, smartmontools -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-freon"; - version = "unstable-2022-02-05"; - - passthru = { - extensionUuid = "freon@UshakovVasilii_Github.yahoo.com"; - extensionPortalSlug = "freon"; - }; - - src = fetchFromGitHub { - owner = "UshakovVasilii"; - repo = "gnome-shell-extension-freon"; - rev = "010c363d9bff8ed28000cbf8df2226dad65078fb"; - hash = "sha256-Fb8y+HoWq+205gqwAD2DVYym1eThGZqDML5HlyhS+4M="; - }; - - nativeBuildInputs = [ glib ]; - - patches = [ - (substituteAll { - src = ./fix_paths.patch; - inherit hddtemp liquidctl lm_sensors procps smartmontools; - netcat = netcat-gnu; - nvmecli = nvme-cli; - }) - ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas --strict --targetdir="freon@UshakovVasilii_Github.yahoo.com/schemas" "freon@UshakovVasilii_Github.yahoo.com/schemas" - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r "freon@UshakovVasilii_Github.yahoo.com" $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "GNOME Shell extension for displaying CPU, GPU, disk temperatures, voltage and fan RPM in the top panel"; - license = licenses.gpl2; - maintainers = with maintainers; [ justinas ]; - homepage = "https://github.com/UshakovVasilii/gnome-shell-extension-freon"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 1ed840670643..6e2f1f6f2620 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -6,7 +6,6 @@ "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { }; - "freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { }; "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; "impatience@gfxmonk.net" = callPackage ./impatience { };