diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-09-23 10:14:20 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2017-09-23 10:16:47 +0200 |
| commit | f7d7c7bedfa54b97420b4b68980536cf5ba927ca (patch) | |
| tree | 5206457aad966e89ed3d6656142d2e4f781dc6e7 | |
| parent | 18ebc8dba96fdfc51165ff4c92aee381388d3578 (diff) | |
| download | nixlib-f7d7c7bedfa54b97420b4b68980536cf5ba927ca.tar nixlib-f7d7c7bedfa54b97420b4b68980536cf5ba927ca.tar.gz nixlib-f7d7c7bedfa54b97420b4b68980536cf5ba927ca.tar.bz2 nixlib-f7d7c7bedfa54b97420b4b68980536cf5ba927ca.tar.lz nixlib-f7d7c7bedfa54b97420b4b68980536cf5ba927ca.tar.xz nixlib-f7d7c7bedfa54b97420b4b68980536cf5ba927ca.tar.zst nixlib-f7d7c7bedfa54b97420b4b68980536cf5ba927ca.zip | |
singular: use gcc5
Progress on: #28643 Fixes: #29682
| -rw-r--r-- | pkgs/applications/science/math/singular/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index b098da060e07..8cd9355a0f63 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf bison pkgconfig ]; preConfigure = '' - find . -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';' - find . -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';' + find . -type f -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';' + find . -type f -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';' ${stdenv.lib.optionalString asLibsingular ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DLIBSINGULAR"''} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc8559b5739a..3db397447f15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18565,9 +18565,12 @@ with pkgs; inherit (gnome3) gtksourceview; }; - singular = callPackage ../applications/science/math/singular {}; + singular = callPackage ../applications/science/math/singular { + stdenv = overrideCC stdenv gcc5; + }; libsingular = callPackage ../applications/science/math/singular { asLibsingular = true; + stdenv = overrideCC stdenv gcc5; }; scilab = callPackage ../applications/science/math/scilab { |