From 47183c813eaa1d96bc76dce41c873f18eead4454 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 22 Mar 2017 17:02:41 +0100 Subject: [PATCH] golly-beta: init at 2.9b2 to test GL issues --- pkgs/applications/science/misc/golly/beta.nix | 59 +++++++++++++++++++ .../science/misc/golly/default.upstream | 1 + pkgs/top-level/all-packages.nix | 1 + 3 files changed, 61 insertions(+) create mode 100644 pkgs/applications/science/misc/golly/beta.nix diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix new file mode 100644 index 000000000000..5fe72e44842d --- /dev/null +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -0,0 +1,59 @@ +{stdenv, fetchurl, fetchgit +, wxGTK, perl, python2, zlib, mesa, libX11 +, automake, autoconf +}: +let + s = # Generated upstream information + rec { + baseName="golly"; + version="2.8"; + name="${baseName}-${version}"; + hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; + }; +in +stdenv.mkDerivation rec { + name = "golly-${version}"; + version = "2.8.99.2.20161122"; + #src = fetchurl { + # url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz"; + # sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; + #}; + src = fetchgit { + url = "git://git.code.sf.net/p/golly/code"; + rev = "93495edf3c9639332c6eb43ca7149c69629ee5d8"; + sha256 = "1j308s9zlqkr3wnl1l32s5zk7r3g4ijwawkkysl8j5ik9sibi2gk"; + }; + + setSourceRoot = '' + export sourceRoot="$(echo */gui-wx/configure)" + ''; + + nativeBuildInputs = [autoconf automake]; + + buildInputs = [ + wxGTK perl python2 zlib mesa libX11 + ]; + + # Link against Python explicitly as it is needed for scripts + makeFlags=[ + "AM_LDFLAGS=" + ]; + NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl"; + preConfigure='' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE + -DPYTHON_SHLIB=$(basename "$( + readlink -f ${python2}/lib/libpython*.so)")" + + sh autogen.sh + ''; + + meta = { + inherit version; + description = "Cellular automata simulation program"; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://sourceforge.net/projects/golly/files/golly"; + }; +} diff --git a/pkgs/applications/science/misc/golly/default.upstream b/pkgs/applications/science/misc/golly/default.upstream index 24032de56684..ab9fb03e7b18 100644 --- a/pkgs/applications/science/misc/golly/default.upstream +++ b/pkgs/applications/science/misc/golly/default.upstream @@ -2,3 +2,4 @@ url http://sourceforge.net/projects/golly/files/golly/ version_link '[-][0-9.]+/$' SF_version_tarball 'src' SF_redirect +minimize_overwrite diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0a23910a461..1fa764218088 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17648,6 +17648,7 @@ with pkgs; gravit = callPackage ../applications/science/astronomy/gravit { }; golly = callPackage ../applications/science/misc/golly { }; + golly-beta = callPackage ../applications/science/misc/golly/beta.nix { }; megam = callPackage ../applications/science/misc/megam { };