Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dd5fd3b1ffaf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 867552957fc3
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 3, 2020

  1. openblas: fix static musl build

    @FRidh
    FRidh committed Jan 3, 2020
    Copy the full SHA
    8675529 View commit details
Showing with 7 additions and 2 deletions.
  1. +3 −1 pkgs/development/libraries/science/math/openblas/default.nix
  2. +4 −1 pkgs/top-level/static.nix
4 changes: 3 additions & 1 deletion pkgs/development/libraries/science/math/openblas/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
# See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
, target ? null
, enableStatic ? false
, enableShared ? true
}:

with stdenv.lib;
@@ -60,7 +61,7 @@ let
TARGET = setTarget "ATHLON";
DYNAMIC_ARCH = true;
NO_AVX512 = true;
USE_OPENMP = true;
USE_OPENMP = !stdenv.hostPlatform.isMusl;
};
};
in
@@ -129,6 +130,7 @@ stdenv.mkDerivation rec {
NUM_THREADS = 64;
INTERFACE64 = blas64;
NO_STATIC = !enableStatic;
NO_SHARED = !enableShared;
CROSS = stdenv.hostPlatform != stdenv.buildPlatform;
HOSTCC = "cc";
# Makefile.system only checks defined status
5 changes: 4 additions & 1 deletion pkgs/top-level/static.nix
View file
Original file line number Diff line number Diff line change
@@ -152,7 +152,10 @@ in {
optipng = super.optipng.override {
static = true;
};
openblas = super.openblas.override { enableStatic = true; };
openblas = super.openblas.override {
enableStatic = true;
enableShared = false;
};
nix = super.nix.override { withAWS = false; };
# openssl 1.1 doesn't compile
openssl = super.openssl_1_0_2.override {