diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2011-12-13 21:00:42 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2011-12-13 21:00:42 +0000 |
| commit | d5c702939c3205ad6b50c95909ae0432ab45ed31 (patch) | |
| tree | 592b59d8e7cd9f1aa3cdb42c02ea7966cc08a0ee /pkgs/applications/science/misc/golly | |
| parent | 77e3784e9ac45bdaecd4a4f17e228c3443052db8 (diff) | |
| download | nixlib-d5c702939c3205ad6b50c95909ae0432ab45ed31.tar nixlib-d5c702939c3205ad6b50c95909ae0432ab45ed31.tar.gz nixlib-d5c702939c3205ad6b50c95909ae0432ab45ed31.tar.bz2 nixlib-d5c702939c3205ad6b50c95909ae0432ab45ed31.tar.lz nixlib-d5c702939c3205ad6b50c95909ae0432ab45ed31.tar.xz nixlib-d5c702939c3205ad6b50c95909ae0432ab45ed31.tar.zst nixlib-d5c702939c3205ad6b50c95909ae0432ab45ed31.zip | |
Update Golly
svn path=/nixpkgs/trunk/; revision=30874
Diffstat (limited to 'pkgs/applications/science/misc/golly')
4 files changed, 9 insertions, 25 deletions
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index ee2e276c6cad..a380f05b0915 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -17,7 +17,7 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doMake" "doDeploy"]; + phaseNames = ["setVars" "doConfigure" "doMakeInstall"]; setVars = a.noDepEntry '' export NIX_LDFLAGS="$NIX_LDFLAGS -lperl -L$(echo "${perl}"/lib/perl5/5*/*/CORE)" pythonLib="$(echo "${python}"/lib/libpython*.so)" @@ -26,14 +26,6 @@ rec { export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib" 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 = { description = "Cellular automata simulation program"; diff --git a/pkgs/applications/science/misc/golly/make-install.make b/pkgs/applications/science/misc/golly/make-install.make deleted file mode 100644 index 1d082e2b6cec..000000000000 --- a/pkgs/applications/science/misc/golly/make-install.make +++ /dev/null @@ -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)) - diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix index f60df2da3152..bf0d9ddada46 100644 --- a/pkgs/applications/science/misc/golly/src-for-default.nix +++ b/pkgs/applications/science/misc/golly/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="2.1-src"; - name="golly-2.1-src"; - hash="0m9sz0b7pwsxpgvscdvab2q8qnncr337gg3anzgzw83z5zyn3rdz"; - url="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.1/golly-2.1-src.tar.gz"; + version="2.3-src"; + name="golly-2.3-src"; + hash="12r1lrrn4c1kafzvz5mmfq3750smqv5dwl1xpj3753h0rl9a9gx1"; + 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.3/golly-2.3-src.tar.gz"; } diff --git a/pkgs/applications/science/misc/golly/src-info-for-default.nix b/pkgs/applications/science/misc/golly/src-info-for-default.nix index c3bbb262a6f5..a83b929f0181 100644 --- a/pkgs/applications/science/misc/golly/src-info-for-default.nix +++ b/pkgs/applications/science/misc/golly/src-info-for-default.nix @@ -1,4 +1,5 @@ { - downloadPage = "http://sourceforge.net/projects/golly/files/"; - method="fetchSF"; + downloadPage = "http://sourceforge.net/projects/golly/files/golly"; + method="fetchSFdirs"; + fileSuffix="-src.tar.gz"; } |