octopus: 9.0 -> 9.1

* switch to GitLab download
* cleanup fftw dependence
This commit is contained in:
Markus Kowalewski 2019-08-19 10:24:44 +02:00
parent 9cb419ee2c
commit a81bb36249
No known key found for this signature in database
GPG key ID: 502A248E3FB4FF48

View file

@ -1,27 +1,26 @@
{ stdenv, fetchurl, symlinkJoin, gfortran, perl, procps { stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps
, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack , libyaml, libxc, fftw, openblas, gsl, netcdf, arpack, autoreconfHook
}: }:
let stdenv.mkDerivation rec {
version = "9.0"; pname = "octopus";
fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; version = "9.1";
in stdenv.mkDerivation { src = fetchFromGitLab {
name = "octopus-${version}"; owner = "octopus-code";
repo = "octopus";
src = fetchurl { rev = version;
url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; sha256 = "1l5fqgllk7rij16q7a3la7qq6isy8a5n37vk400qcscw1v32s90h";
sha256 = "0p1gjykjnzm4m93mgjsmnxd0n2j381jk5kn3a7gkzxanixp60ilm";
}; };
nativeBuildInputs = [ perl procps fftw.dev ]; nativeBuildInputs = [ perl procps autoreconfHook ];
buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out netcdf arpack ]; buildInputs = [ libyaml gfortran libxc openblas gsl fftw netcdf arpack ];
configureFlags = [ configureFlags = [
"--with-yaml-prefix=${libyaml}" "--with-yaml-prefix=${libyaml}"
"--with-blas=-lopenblas" "--with-blas=-lopenblas"
"--with-lapack=-lopenblas" "--with-lapack=-lopenblas"
"--with-fftw-prefix=${fftwAll}" "--with-fftw-prefix=${fftw.dev}"
"--with-gsl-prefix=${gsl}" "--with-gsl-prefix=${gsl}"
"--with-libxc-prefix=${libxc}" "--with-libxc-prefix=${libxc}"
]; ];