Merge pull request #39370 from timokau/singular-ntl

singular: Fix ntl dependency
This commit is contained in:
Michael Raskin 2018-04-24 10:54:23 +00:00 committed by GitHub
commit bc6f7a9ccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig { stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig
, autoreconfHook , autoreconfHook
, file
, flint , flint
, ntl , ntl
, cddlib , cddlib
@ -18,7 +19,9 @@ stdenv.mkDerivation rec {
sha256 = "0wvgz7l1b7zkpmim0r3mvv4fp8xnhlbz4c7hc90rn30snlansnf1"; sha256 = "0wvgz7l1b7zkpmim0r3mvv4fp8xnhlbz4c7hc90rn30snlansnf1";
}; };
configureFlags = stdenv.lib.optionals enableFactory [ configureFlags = [
"--with-ntl=${ntl}"
] ++stdenv.lib.optionals enableFactory [
"--enable-factory" "--enable-factory"
] ++ stdenv.lib.optionals enableGfanlib [ ] ++ stdenv.lib.optionals enableGfanlib [
"--enable-gfanlib" "--enable-gfanlib"
@ -42,11 +45,19 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals enableGfanlib [ ] ++ stdenv.lib.optionals enableGfanlib [
cddlib cddlib
]; ];
nativeBuildInputs = [ autoconf bison perl pkgconfig autoreconfHook ]; nativeBuildInputs = [
bison
perl
pkgconfig
autoreconfHook
];
preConfigure = '' preAutoreconf = ''
find . -type f -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';' find . -type f -readable -writable -exec sed \
find . -type f -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';' -e 's@/bin/rm@${coreutils}&@g' \
-e 's@/bin/uname@${coreutils}&@g' \
-e 's@/usr/bin/file@${file}/bin/file@g' \
-i '{}' ';'
''; '';
hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";