Update Golly

svn path=/nixpkgs/trunk/; revision=30874
This commit is contained in:
Michael Raskin 2011-12-13 21:00:42 +00:00
parent 77e3784e9a
commit d5c702939c
4 changed files with 9 additions and 25 deletions

View File

@ -17,7 +17,7 @@ rec {
inherit buildInputs; inherit buildInputs;
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["setVars" "doMake" "doDeploy"]; phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
setVars = a.noDepEntry '' setVars = a.noDepEntry ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lperl -L$(echo "${perl}"/lib/perl5/5*/*/CORE)" export NIX_LDFLAGS="$NIX_LDFLAGS -lperl -L$(echo "${perl}"/lib/perl5/5*/*/CORE)"
pythonLib="$(echo "${python}"/lib/libpython*.so)" pythonLib="$(echo "${python}"/lib/libpython*.so)"
@ -26,14 +26,6 @@ rec {
export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib" export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib"
echo "Flags: $NIX_LDFLAGS" echo "Flags: $NIX_LDFLAGS"
''; '';
goSrcDir = ''cd */'';
makeFlags = [
"-f makefile-gtk"
];
doDeploy = a.fullDepEntry ''
cat < ${./make-install.make} >> makefile-gtk
make -f makefile-gtk out="$out" install
'' ["minInit" "doMake" "defEnsureDir"];
meta = { meta = {
description = "Cellular automata simulation program"; description = "Cellular automata simulation program";

View File

@ -1,9 +0,0 @@
install_file = echo "\#! /bin/sh" > "$(out)/bin/$(binfile)"; echo "$(out)/share/golly/$(binfile)" >> "$(out)/bin/$(binfile)"; chmod a+x "$(out)/bin/$(binfile)";
install:
mkdir -p "$(out)/share/golly"
mkdir -p "$(out)/bin"
cp -r $(BINFILES) $(SHAREDFILES) "$(out)/share/golly"
$(foreach binfile,$(BINFILES),$(install_file))

View File

@ -1,9 +1,9 @@
rec { rec {
version="2.1-src"; version="2.3-src";
name="golly-2.1-src"; name="golly-2.3-src";
hash="0m9sz0b7pwsxpgvscdvab2q8qnncr337gg3anzgzw83z5zyn3rdz"; hash="12r1lrrn4c1kafzvz5mmfq3750smqv5dwl1xpj3753h0rl9a9gx1";
url="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz"; url="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";
advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz"; advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";
} }

View File

@ -1,4 +1,5 @@
{ {
downloadPage = "http://sourceforge.net/projects/golly/files/"; downloadPage = "http://sourceforge.net/projects/golly/files/golly";
method="fetchSF"; method="fetchSFdirs";
fileSuffix="-src.tar.gz";
} }