Merge remote-tracking branch 'upstream/hardened-stdenv' into hardened-stdenv
This commit is contained in:
commit
6539901c7f
@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qalculate-gtk-${version}";
|
||||
version = "0.9.8";
|
||||
|
@ -40,5 +40,5 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gcc ljack2 libsndfile fftw curl libXt qt readline ]
|
||||
++ optional useSCEL emacs;
|
||||
++ optional useSCEL emacs;
|
||||
}
|
||||
|
@ -66,6 +66,8 @@ stdenv.mkDerivation {
|
||||
patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch
|
||||
++ optional stdenv.isDarwin ./tmpdir.patch;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# Configure outside of the source directory.
|
||||
preConfigure = ''
|
||||
mkdir build
|
||||
@ -76,7 +78,6 @@ stdenv.mkDerivation {
|
||||
# * -t 0 disables use of multi-threading. It's not quite clear what the
|
||||
# consequences of that setting are and whether it's necessary or not.
|
||||
configureFlags = [
|
||||
"-Fa alg"
|
||||
"-t ${threads}"
|
||||
cpuConfig
|
||||
] ++ optional shared "--shared"
|
||||
|
Loading…
Reference in New Issue
Block a user