diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2022-01-31 13:24:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 13:24:26 +0000 |
| commit | 9b76122d71deb28ed6273fe84705e0cdda03b0ee (patch) | |
| tree | 4a980ba93a86faa3cc5693d08dd4dc73c3c4241f /pkgs/applications/science/math/sage/sage-with-env.nix | |
| parent | 4971c8caa8ecc0d2a69b682d8f16b56c372671a5 (diff) | |
| parent | 8ec9a32829f9510922481a99e67182478558cfb9 (diff) | |
| download | nixpkgs-9b76122d71deb28ed6273fe84705e0cdda03b0ee.tar nixpkgs-9b76122d71deb28ed6273fe84705e0cdda03b0ee.tar.gz nixpkgs-9b76122d71deb28ed6273fe84705e0cdda03b0ee.tar.bz2 nixpkgs-9b76122d71deb28ed6273fe84705e0cdda03b0ee.tar.lz nixpkgs-9b76122d71deb28ed6273fe84705e0cdda03b0ee.tar.xz nixpkgs-9b76122d71deb28ed6273fe84705e0cdda03b0ee.tar.zst nixpkgs-9b76122d71deb28ed6273fe84705e0cdda03b0ee.zip | |
Merge pull request #140889 from collares/sage-9.5
sage: 9.4 -> 9.5
Diffstat (limited to 'pkgs/applications/science/math/sage/sage-with-env.nix')
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-with-env.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index b74ec4007e6..df3a1467d53 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -18,7 +18,6 @@ , eclib , ntl , ecm -, pynac , pythonEnv }: @@ -36,7 +35,6 @@ let blas lapack singular three - pynac giac gap pari @@ -126,6 +124,10 @@ stdenv.mkDerivation rec { cp -r src/bin "$out/bin" cp -r build/bin "$out/build/bin" + # sage assumes the existence of sage-src-env-config.in means it's being executed in-tree. in this case, it + # adds SAGE_SRC/bin to PATH, breaking our wrappers + rm "$out/bin"/*.in "$out/build/bin"/*.in + cp -f '${sage-env}/sage-env' "$out/bin/sage-env" substituteInPlace "$out/bin/sage-env" \ --subst-var-by sage-local "$out" |