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: f32e75c72845
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 636a5a6fee34
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 19, 2020

  1. blas: fix build on darwin

    @smaret
    smaret committed Apr 19, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    elevenfive Matthew Zavislak
    GPG key ID: D8806E3DD5033C7D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    712bf55 View commit details

Commits on Apr 20, 2020

  1. Merge pull request #85582 from smaret/fix-blas-darwin 

    blas: fix build on darwin
    @marsam
    marsam authored Apr 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    636a5a6 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/build-support/alternatives/blas/default.nix
2 changes: 1 addition & 1 deletion pkgs/build-support/alternatives/blas/default.nix
View file
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension}
'' else if stdenv.hostPlatform.isDarwin then ''
install_name_tool \
-id libblas${canonicalExtension}
-id libblas${canonicalExtension} \
-add_rpath ${lib.getLib blasProvider}/lib \
$out/lib/libblas${canonicalExtension}
'' else "") + ''