diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-03 10:05:50 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-04 10:45:22 +0100 |
| commit | 0a2caa41fe0da9e5c36f47994594650f00e1d111 (patch) | |
| tree | e7b9a6f88de8a8c3ee71ed65b2d9257836f9a3a0 /pkgs/applications/science/misc | |
| parent | f665828fa374580f4b2fd725761d23e18f55e526 (diff) | |
| download | nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.gz nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.bz2 nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.lz nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.xz nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.zst nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.zip | |
Python: drop `python.majorVersion`
Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`. For implementation version, use `python.sourceVersion`. Some expressions were broken. Those that were identified were fixed. fixup major
Diffstat (limited to 'pkgs/applications/science/misc')
| -rw-r--r-- | pkgs/applications/science/misc/golly/beta.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/golly/default.nix | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 83b9c5a04a19..6f11caf4d9ab 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "golly-${version}"; + pname = "golly"; version = "2.8.99.2.20161122"; #src = fetchurl { # url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { makeFlags=[ "AM_LDFLAGS=" ]; - NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl"; + NIX_LDFLAGS="-l${python2.libPrefix} -lperl"; preConfigure='' export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index cfa4dca4b0de..74fa4cc02ed5 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,8 +1,7 @@ {stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}: stdenv.mkDerivation rec { - baseName="golly"; + pname = "golly"; version = "3.2"; - name="${baseName}-${version}"; src = fetchurl { sha256 = "0cg9mbwmf4q6qxhqlnzrxh9y047banxdb8pd3hgj3smmja2zf0jd"; @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags=[ "AM_LDFLAGS=" ]; - NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl"; + NIX_LDFLAGS="-l${python2.libPrefix} -lperl"; preConfigure='' export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE |