From 4f239f9d4973ceb00d1df2f85a853aeb60c34af9 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 4 Mar 2018 01:36:31 +0100 Subject: [PATCH] sage: Make build more platform independant --- pkgs/applications/science/math/sage/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 007cb68177e5..eed964e3fa57 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -30,6 +30,7 @@ , texinfo , hevea , buildDocs ? false +, optimize ? false # optimize sage to the current system (obviously impure) }: stdenv.mkDerivation rec { @@ -139,7 +140,6 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionals(buildDocs) [ "--docdir=$(doc)" ]; preConfigure = '' export SAGE_NUM_THREADS="$NIX_BUILD_CORES" - export SAGE_ATLAS_ARCH=fast export HOME=/tmp/sage-home export SAGE_ROOT="$PWD" @@ -160,6 +160,9 @@ stdenv.mkDerivation rec { mkdir -p "$doc" export SAGE_DOC="$doc" export SAGE_DOCBUILD_OPTS="--no-pdf-links -k" + '' + + stdenv.lib.optionalString (!optimize) '' + export SAGE_FAT_BINARY=yes ''; buildFlags = if (buildDocs) then "doc" else "build";