Unverified Commit 4c177974 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #252452 from 7c6f434c/golly-4.2 

golly: 4.1 -> 4.2
parents 9b4d043b 5ab5c5d6

pkgs/applications/science/misc/golly/default.nix

+3 −5
Original line number Diff line number Diff line 
{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 = ''

pkgs/top-level/all-packages.nix

+9 −1
Original line number Diff line number Diff line
@@ -40126,7 +40126,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 { };