From 6d431182831597316374558b94c5bfe561befffe Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Fri, 18 Oct 2024 10:20:42 +0200
Subject: [PATCH] golly: 4.2 -> 4.3

---
 pkgs/applications/science/misc/golly/default.nix | 12 +++++-------
 pkgs/top-level/all-packages.nix                  |  1 -
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index b509387fe883..8a2bb17d2d53 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -1,15 +1,15 @@
-{lib, stdenv, fetchurl, wxGTK, perl, python3, zlib, libGLU, libGL, libX11, SDL2}:
+{lib, stdenv, fetchurl, wxGTK, python3, zlib, libGLU, libGL, libX11, SDL2}:
 stdenv.mkDerivation rec {
   pname = "golly";
-  version = "4.2";
+  version = "4.3";
 
   src = fetchurl {
-    hash = "sha256-VpEoqSPaZMP/AGIYZAbk5R/f8Crqvx8pKYN1O9Bl6V0=";
+    hash = "sha256-UdJHgGPn7FDN4rYTgfPBAoYE5FGC43TP8OFBmYIqCB0=";
     url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz";
   };
 
   buildInputs = [
-    wxGTK perl python3 zlib libGLU libGL libX11 SDL2
+    wxGTK python3 zlib libGLU libGL libX11 SDL2
   ];
 
   nativeBuildInputs = [
@@ -22,16 +22,14 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -e 's@PYTHON_SHLIB@${python3}/lib/libpython3.so@' -i wxprefs.cpp
-    sed -e 's@PERL_SHLIB@'"$(find "${perl}/lib/" -name libperl.so)"'@' -i wxprefs.cpp
     ! grep _SHLIB *.cpp
 
     grep /lib/libpython wxprefs.cpp
-    grep /libperl wxprefs.cpp
   '';
 
   makeFlags=[
     "-f" "makefile-gtk"
-    "ENABLE_SOUND=1" "ENABLE_PERL=1"
+    "ENABLE_SOUND=1"
     "GOLLYDIR=${placeholder "out"}/share/golly"
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 977659829075..3a2d14416407 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36766,7 +36766,6 @@ with pkgs;
         curl
       ];
     });
-    perl = perl540;
   };
 
   megam = callPackage ../applications/science/misc/megam {