From a403d3287c9b27a64c48b0d4e4abe82da6c4d234 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Sat, 4 Oct 2025 14:01:52 +0200 Subject: [PATCH 1/7] eaglemode: remove `pname` usages --- pkgs/by-name/ea/eaglemode/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ea/eaglemode/package.nix b/pkgs/by-name/ea/eaglemode/package.nix index 47de71c1090b..1136aee8bcd7 100644 --- a/pkgs/by-name/ea/eaglemode/package.nix +++ b/pkgs/by-name/ea/eaglemode/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { version = "0.96.2"; src = fetchurl { - url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2"; + url = "mirror://sourceforge/eaglemode/eaglemode-${version}.tar.bz2"; hash = "sha256:1al5n2mcjp0hmsvi4hsdmzd7i0id5i3255xplk0il1nmzydh312a"; }; @@ -109,16 +109,16 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${runtimeDeps}" for i in 32 48 96; do mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - ln -s $out/res/icons/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + ln -s $out/res/icons/eaglemode$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/eaglemode.png done runHook postInstall ''; desktopItems = [ (makeDesktopItem { - name = pname; - exec = pname; - icon = pname; + name = "eaglemode"; + exec = "eaglemode"; + icon = "eaglemode"; desktopName = "Eagle Mode"; genericName = meta.description; categories = [ From e9eac7a5c72587a05d8a128a1330a20d5a86e6cf Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Sat, 4 Oct 2025 14:02:37 +0200 Subject: [PATCH 2/7] eaglemode: rec -> finalAttrs --- pkgs/by-name/ea/eaglemode/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ea/eaglemode/package.nix b/pkgs/by-name/ea/eaglemode/package.nix index 1136aee8bcd7..71b86656550a 100644 --- a/pkgs/by-name/ea/eaglemode/package.nix +++ b/pkgs/by-name/ea/eaglemode/package.nix @@ -32,12 +32,12 @@ extraRuntimeDeps ? [ ], }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eaglemode"; version = "0.96.2"; src = fetchurl { - url = "mirror://sourceforge/eaglemode/eaglemode-${version}.tar.bz2"; + url = "mirror://sourceforge/eaglemode/eaglemode-${finalAttrs.version}.tar.bz2"; hash = "sha256:1al5n2mcjp0hmsvi4hsdmzd7i0id5i3255xplk0il1nmzydh312a"; }; @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { exec = "eaglemode"; icon = "eaglemode"; desktopName = "Eagle Mode"; - genericName = meta.description; + genericName = "Zoomable User Interface"; categories = [ "Game" "Graphics" @@ -145,4 +145,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) From 2097f35141f04d7c19698a88ef3f6ca74c3cac66 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Sat, 4 Oct 2025 14:04:19 +0200 Subject: [PATCH 3/7] eaglemode: use SRI source hash --- pkgs/by-name/ea/eaglemode/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ea/eaglemode/package.nix b/pkgs/by-name/ea/eaglemode/package.nix index 71b86656550a..181ab22ca3cb 100644 --- a/pkgs/by-name/ea/eaglemode/package.nix +++ b/pkgs/by-name/ea/eaglemode/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://sourceforge/eaglemode/eaglemode-${finalAttrs.version}.tar.bz2"; - hash = "sha256:1al5n2mcjp0hmsvi4hsdmzd7i0id5i3255xplk0il1nmzydh312a"; + hash = "sha256-SoQBm//VBhrBpLeXIkYsLYJ42q9NQxK3rhBcyaqwhao="; }; # Fixes "Error: No time zones found." on the clock From 7255938a8fbae663ac86d5b0f1b9df004676729f Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Sat, 4 Oct 2025 14:12:21 +0200 Subject: [PATCH 4/7] eaglemode: fix updateScript --- pkgs/by-name/ea/eaglemode/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ea/eaglemode/package.nix b/pkgs/by-name/ea/eaglemode/package.nix index 181ab22ca3cb..3d4955b87d94 100644 --- a/pkgs/by-name/ea/eaglemode/package.nix +++ b/pkgs/by-name/ea/eaglemode/package.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = directoryListingUpdater { url = "https://eaglemode.sourceforge.net/download.html"; - extraRegex = "(?!.*(x86_64|setup64|livecd)).*"; + extraRegex = "(?!.*(x86_64|setup64|livecd|amd64)).*"; }; meta = { From 79ecd8643a5e96a77c851c7cab9668adee7db049 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Sat, 4 Oct 2025 14:23:36 +0200 Subject: [PATCH 5/7] eaglemode: `--replace` -> `--replace-fail` --- pkgs/by-name/ea/eaglemode/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ea/eaglemode/package.nix b/pkgs/by-name/ea/eaglemode/package.nix index 3d4955b87d94..ac7fd0dd7215 100644 --- a/pkgs/by-name/ea/eaglemode/package.nix +++ b/pkgs/by-name/ea/eaglemode/package.nix @@ -43,7 +43,8 @@ stdenv.mkDerivation (finalAttrs: { # Fixes "Error: No time zones found." on the clock postPatch = '' - substituteInPlace src/emClock/emTimeZonesModel.cpp --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + substituteInPlace src/emClock/emTimeZonesModel.cpp \ + --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; nativeBuildInputs = [ From 6da3dfdc31af8536b0baa5bbacc6d9eab82ab43f Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Sat, 4 Oct 2025 14:22:25 +0200 Subject: [PATCH 6/7] eaglemode: move to gtk3 (#410814) --- pkgs/by-name/ea/eaglemode/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ea/eaglemode/package.nix b/pkgs/by-name/ea/eaglemode/package.nix index ac7fd0dd7215..2b36983a1a19 100644 --- a/pkgs/by-name/ea/eaglemode/package.nix +++ b/pkgs/by-name/ea/eaglemode/package.nix @@ -12,7 +12,7 @@ pkg-config, librsvg, glib, - gtk2, + gtk3, libXext, libXxf86vm, poppler, @@ -45,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/emClock/emTimeZonesModel.cpp \ --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + + substituteInPlace makers/emPdf.maker.pm \ + --replace-fail gtk+-2.0 gtk+-3.0 ''; nativeBuildInputs = [ @@ -62,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { libwebp librsvg glib - gtk2 + gtk3 libXxf86vm libXext poppler From 682274cb0c396106009d4bdaccd15b2922e762d1 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Sat, 4 Oct 2025 14:15:25 +0200 Subject: [PATCH 7/7] eaglemode: 0.96.2 -> 0.96.3 --- pkgs/by-name/ea/eaglemode/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ea/eaglemode/package.nix b/pkgs/by-name/ea/eaglemode/package.nix index 2b36983a1a19..c9b48d69b5a3 100644 --- a/pkgs/by-name/ea/eaglemode/package.nix +++ b/pkgs/by-name/ea/eaglemode/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "eaglemode"; - version = "0.96.2"; + version = "0.96.3"; src = fetchurl { url = "mirror://sourceforge/eaglemode/eaglemode-${finalAttrs.version}.tar.bz2"; - hash = "sha256-SoQBm//VBhrBpLeXIkYsLYJ42q9NQxK3rhBcyaqwhao="; + hash = "sha256-AHeupgEnyQylRWFDrPeo4b0mNONqG+6QwWnRpYknqOQ="; }; # Fixes "Error: No time zones found." on the clock