diff options
Diffstat (limited to 'pkgs')
4 files changed, 30 insertions, 48 deletions
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 9d198cd5c7f80..a29d37cc41a1c 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,41 +1,33 @@ -x@{builderDefsPackage, - wxGTK, perl, python, zlib - , ...}: -builderDefsPackage -(a : +{stdenv, fetchurl, wxGTK, perl, python, zlib}: let - s = import ./src-for-default.nix; - helperArgNames = ["builderDefsPackage"] ++ - []; - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + s = # Generated upstream information + rec { + baseName="golly"; + version="2.6"; + name="${baseName}-${version}"; + hash="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz"; + url="mirror://sourceforge/project/golly/golly/golly-2.6/golly-2.6-src.tar.gz"; + sha256="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz"; + }; + buildInputs = [ + wxGTK perl python zlib + ]; in -rec { - src = a.fetchUrlFromSrcInfo s; - - inherit (s) name; +stdenv.mkDerivation { + inherit (s) name version; inherit buildInputs; - - /* doConfigure should be removed if not needed */ - 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)" - pythonLib="''${pythonLib##*/lib}" - pythonLib="''${pythonLib%%.so}" - export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib" - echo "Flags: $NIX_LDFLAGS" + src = fetchurl { + inherit (s) url sha256; + }; + preConfigure = '' + cd gui-wx/configure ''; - meta = { + inherit (s) version; description = "Cellular automata simulation program"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = with a.lib.licenses; - gpl2; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://sourceforge.net/projects/golly/files/golly"; }; -}) x +} diff --git a/pkgs/applications/science/misc/golly/default.upstream b/pkgs/applications/science/misc/golly/default.upstream new file mode 100644 index 0000000000000..57881e5de3554 --- /dev/null +++ b/pkgs/applications/science/misc/golly/default.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/golly/files/golly/ +version_link '[-][0-9.]+/$' +SF_version_tarball +SF_redirect diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix deleted file mode 100644 index 50d3d41a8ba46..0000000000000 --- a/pkgs/applications/science/misc/golly/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="2.4"; - name="golly-2.4"; - hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w"; - url="mirror://sourceforge/golly/golly-2.4-src.tar.gz"; - advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-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 deleted file mode 100644 index a83b929f01818..0000000000000 --- a/pkgs/applications/science/misc/golly/src-info-for-default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - downloadPage = "http://sourceforge.net/projects/golly/files/golly"; - method="fetchSFdirs"; - fileSuffix="-src.tar.gz"; -} |