summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-02-10 20:16:16 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2019-02-10 20:16:16 -0500
commit2433c575f006e82bedf81306b53e7c840a9b4b49 (patch)
tree2553d0401ab4409e0e77dd80b568f4733de324e7
parentcfc43138cb2d906b9b24563a4487949efb106532 (diff)
downloadnixpkgs-2433c575f006e82bedf81306b53e7c840a9b4b49.tar
nixpkgs-2433c575f006e82bedf81306b53e7c840a9b4b49.tar.gz
nixpkgs-2433c575f006e82bedf81306b53e7c840a9b4b49.tar.bz2
nixpkgs-2433c575f006e82bedf81306b53e7c840a9b4b49.tar.lz
nixpkgs-2433c575f006e82bedf81306b53e7c840a9b4b49.tar.xz
nixpkgs-2433c575f006e82bedf81306b53e7c840a9b4b49.tar.zst
nixpkgs-2433c575f006e82bedf81306b53e7c840a9b4b49.zip
openblas: fix on linux
This reverse changes made cfc4313 which broke builds on linux. Still
not sure why this broke Linux, but we can investigate it later.
“buildPackages.stdenv.cc” shouldn’t be put in nativeBuildInputs in
general. Either way, this restores hashes to before that commit.

thanks to @jethrokuan
-rw-r--r--pkgs/development/libraries/science/math/openblas/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 59897668823..68439f5921d 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -102,8 +102,12 @@ stdenv.mkDerivation rec {
     "relro" "bindnow"
   ];
 
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ perl which gfortran ];
+  nativeBuildInputs = [
+    perl
+    which
+    buildPackages.gfortran
+    buildPackages.stdenv.cc
+  ];
 
   makeFlags = mapAttrsToList (var: val: "${var}=${toString val}") (config // {
     FC = "${stdenv.cc.targetPrefix}gfortran";