alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

singular: use gcc5

Browse source 
Progress on: #28643
Fixes: #29682
This commit is contained in:
Michael Raskin 2017-09-23 10:14:20 +02:00
parent 18ebc8dba9
commit f7d7c7bedf
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/science/math/singular/default.nix
View file

@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf bison pkgconfig ]; nativeBuildInputs = [ autoconf bison pkgconfig ];
preConfigure = '' preConfigure = ''
find . -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';' find . -type f -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/uname@${coreutils}&@g' -i '{}' ';'
${stdenv.lib.optionalString asLibsingular ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DLIBSINGULAR"''} ${stdenv.lib.optionalString asLibsingular ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DLIBSINGULAR"''}
''; '';

5
pkgs/top-level/all-packages.nix
View file

@ -18565,9 +18565,12 @@ with pkgs;
inherit (gnome3) gtksourceview; 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 { libsingular = callPackage ../applications/science/math/singular {
asLibsingular = true; asLibsingular = true;
stdenv = overrideCC stdenv gcc5;
}; };
scilab = callPackage ../applications/science/math/scilab { scilab = callPackage ../applications/science/math/scilab {