public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/hardened-stdenv' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster 2016-07-15 15:02:16 +00:00
commit 6539901c7f
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/science/math/qalculate-gtk/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: { stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qalculate-gtk-${version}"; name = "qalculate-gtk-${version}";
version = "0.9.8"; version = "0.9.8";

2
pkgs/development/interpreters/supercollider/default.nix
View File

@ -40,5 +40,5 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gcc ljack2 libsndfile fftw curl libXt qt readline ] gcc ljack2 libsndfile fftw curl libXt qt readline ]
++ optional useSCEL emacs; ++ optional useSCEL emacs;
} }

3
pkgs/development/libraries/science/math/atlas/default.nix
View File

@ -66,6 +66,8 @@ stdenv.mkDerivation {
patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch
++ optional stdenv.isDarwin ./tmpdir.patch; ++ optional stdenv.isDarwin ./tmpdir.patch;
hardeningDisable = [ "format" ];
# Configure outside of the source directory. # Configure outside of the source directory.
preConfigure = '' preConfigure = ''
mkdir build mkdir build
@ -76,7 +78,6 @@ stdenv.mkDerivation {
# * -t 0 disables use of multi-threading. It's not quite clear what the # * -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. # consequences of that setting are and whether it's necessary or not.
configureFlags = [ configureFlags = [
"-Fa alg"
"-t ${threads}" "-t ${threads}"
cpuConfig cpuConfig
] ++ optional shared "--shared" ] ++ optional shared "--shared"