Unverified Commit 72b10ff6 authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

Merge pull request #258278 from markuskowa/split-libxsmm 

libxsmm: split outputs -> out, dev, doc
parents 66779272 f1116cae

pkgs/applications/science/chemistry/cp2k/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { 
                 -ftree-vectorize -funroll-loops -msse2 \

                 -std=f2008 \

                 -fopenmp -ftree-vectorize -funroll-loops \

                 -I${libxc}/include -I${libxsmm}/include \

                 -I${libxc}/include -I${lib.getDev libxsmm}/include \

                 -I${libint}/include ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"}

    LIBS       = -lfftw3 -lfftw3_threads \

                 -lscalapack -lblas -llapack \

pkgs/development/libraries/libxsmm/default.nix

+8 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-PpMiD/PeQ0pe5hqFG6VFHWpR8y3wnO2z1dJfHHeItlQ=";

  };



  outputs = [ "out" "dev" "doc" ];

  nativeBuildInputs = [

    gfortran

    python3
@@ -34,6 +35,13 @@ stdenv.mkDerivation rec { 
    "STATIC=${static}"

  ];



  postInstall = ''

    mkdir -p $dev/lib/pkgconfig

    mv $out/lib/*.pc $dev/lib/pkgconfig



    moveToOutput "share/libxsmm" "$doc"

  '';



  prePatch = ''

    patchShebangs .

  '';