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
base: 5256f591479d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a7c70f2e10bc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 14, 2020

  1. mkl: fix expectation of MKLROOT being set in pkg-config files 

    The Intel MKL pkg-config files did not work, because they expect that
the MKLROOT environment variable is set. This change replaces
occurences by the actual path of MKL in the Nix store.

Since the pkg-config files seem to break quite frequently after
upgrades, add a post-install check to validate the pkg-config files.

(cherry picked from commit e88673a)
    @danieldk
    danieldk committed May 14, 2020
    Copy the full SHA
    2dd4f2a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #87836 from danieldk/mkl-pkgconfig-20.03 

    [20.03] mkl: fix expectation of MKLROOT being set in pkg-config files
    @bhipple
    bhipple committed May 14, 2020
    Copy the full SHA
    a7c70f2 View commit details
    Browse the repository at this point in the history