diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-11 23:48:08 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-11 23:48:08 +0100 |
| commit | f33fa1b66bbf181503e87a957e05c841093f2f8d (patch) | |
| tree | 8cbe0596681358965ebea30c2320dc3f53297827 /pkgs/applications/science | |
| parent | 5cf4905f3bec4c787820fae7a050c52be886c00a (diff) | |
| parent | ea49ac04966380be9bc77c62c0d01862b515e6a6 (diff) | |
| download | nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.gz nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.bz2 nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.lz nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.xz nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.zst nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/development/libraries/boost/generic.nix
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/misc/golly/default.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index a29d37cc41a1..63a0be47c474 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -13,15 +13,27 @@ let wxGTK perl python zlib ]; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit (s) name version; inherit buildInputs; src = fetchurl { inherit (s) url sha256; }; - preConfigure = '' - cd gui-wx/configure + + sourceRoot="${name}-src/gui-wx/configure"; + + # Link against Python explicitly as it is needed for scripts + makeFlags=[ + "AM_LDFLAGS=" + ]; + NIX_LDFLAGS="-lpython${python.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 ${python}/lib/libpython*.so)")" ''; + meta = { inherit (s) version; description = "Cellular automata simulation program"; |