diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-15 15:02:16 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-15 15:02:16 +0000 |
| commit | 6539901c7f5eeb18cf5e9a493c230a912ff27f82 (patch) | |
| tree | 0fe08bffc81bb9c4703e9b318201ef18b2a733b1 | |
| parent | 5185bc177309c62e53dad1ad346d1220f0e77bd4 (diff) | |
| parent | f597e97236c9aad0470cc4744353e3e4c4c217b0 (diff) | |
| download | nixlib-6539901c7f5eeb18cf5e9a493c230a912ff27f82.tar nixlib-6539901c7f5eeb18cf5e9a493c230a912ff27f82.tar.gz nixlib-6539901c7f5eeb18cf5e9a493c230a912ff27f82.tar.bz2 nixlib-6539901c7f5eeb18cf5e9a493c230a912ff27f82.tar.lz nixlib-6539901c7f5eeb18cf5e9a493c230a912ff27f82.tar.xz nixlib-6539901c7f5eeb18cf5e9a493c230a912ff27f82.tar.zst nixlib-6539901c7f5eeb18cf5e9a493c230a912ff27f82.zip | |
Merge remote-tracking branch 'upstream/hardened-stdenv' into hardened-stdenv
3 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 72a31fb57643..d58eea6f9b94 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: + stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; version = "0.9.8"; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 6f54452da3fb..a83b04fec704 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -40,5 +40,5 @@ stdenv.mkDerivation rec { buildInputs = [ gcc ljack2 libsndfile fftw curl libXt qt readline ] - ++ optional useSCEL emacs; + ++ optional useSCEL emacs; } diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index db8aff49c002..6ff7e387ec1f 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -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" |