diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-03-04 00:46:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-04 00:46:25 +0000 |
| commit | cf1b51aba2780fda582a18b1f97b1919339ddcd9 (patch) | |
| tree | 696db3651f47c8566917e76c48b69202848e7b29 | |
| parent | b84fd70d88f121de536f48c7bc08b3678fe8cabd (diff) | |
| parent | 4f239f9d4973ceb00d1df2f85a853aeb60c34af9 (diff) | |
| download | nixpkgs-cf1b51aba2780fda582a18b1f97b1919339ddcd9.tar nixpkgs-cf1b51aba2780fda582a18b1f97b1919339ddcd9.tar.gz nixpkgs-cf1b51aba2780fda582a18b1f97b1919339ddcd9.tar.bz2 nixpkgs-cf1b51aba2780fda582a18b1f97b1919339ddcd9.tar.lz nixpkgs-cf1b51aba2780fda582a18b1f97b1919339ddcd9.tar.xz nixpkgs-cf1b51aba2780fda582a18b1f97b1919339ddcd9.tar.zst nixpkgs-cf1b51aba2780fda582a18b1f97b1919339ddcd9.zip | |
Merge pull request #36273 from timokau/sage-fat-binary
sage: Make build more platform independant
| -rw-r--r-- | pkgs/applications/science/math/sage/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 007cb68177e..eed964e3fa5 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"; |