golly: 4.2 -> 4.3 (#349481)

This commit is contained in:
7c6f434c 2024-10-18 10:10:45 +00:00 committed by GitHub
commit 9f9c4e2121
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 8 deletions

View File

@ -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"
];

View File

@ -36762,7 +36762,6 @@ with pkgs;
curl
];
});
perl = perl540;
};
megam = callPackage ../applications/science/misc/megam {