dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

golly: 4.1 -> 4.2

Browse Source
This commit is contained in:
Michael Raskin 2023-08-30 23:48:57 +02:00
parent a3ab4086a2
commit 5ab5c5d6c7
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/science/misc/golly/default.nix
View File

@ -1,10 +1,10 @@
{lib, stdenv, fetchurl, wxGTK, perl, python3, zlib, libGLU, libGL, libX11, SDL2}:
stdenv.mkDerivation rec {
pname = "golly";
version = "4.1";
version = "4.2";
src = fetchurl {
sha256 = "1j30dpzy6wh8fv1j2750hzc6wb0nhk83knl9fapccxgxw9n5lrbc";
hash = "sha256-VpEoqSPaZMP/AGIYZAbk5R/f8Crqvx8pKYN1O9Bl6V0=";
url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz";
};
@ -17,9 +17,6 @@ stdenv.mkDerivation rec {
'';
postPatch = ''
sed -e '/gollydir =/agollydir += "/../share/golly/";' -i wxgolly.cpp
grep share/golly wxgolly.cpp
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
@ -31,6 +28,7 @@ stdenv.mkDerivation rec {
makeFlags=[
"-f" "makefile-gtk"
"ENABLE_SOUND=1" "ENABLE_PERL=1"
"GOLLYDIR=${placeholder "out"}/share/golly"
];
installPhase = ''

10
pkgs/top-level/all-packages.nix
View File

@ -40111,7 +40111,15 @@ with pkgs;
gravit = callPackage ../applications/science/astronomy/gravit { };
golly = callPackage ../applications/science/misc/golly {
wxGTK = wxGTK32;
wxGTK = wxGTK32.overrideAttrs (x: {
configureFlags = x.configureFlags ++ [
"--enable-webrequest"
];
buildInputs = x.buildInputs ++ [
curl
];
});
perl = perl536;
};
megam = callPackage ../applications/science/misc/megam { };