Unverified Commit 9f9c4e21 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

golly: 4.2 -> 4.3 (#349481)

parents dddcb351 6d431182

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

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

  ];

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -36762,7 +36762,6 @@ with pkgs; 
        curl

      ];

    });

    perl = perl540;

  };















  megam = callPackage ../applications/science/misc/megam {