From 308ee1ca1158f60816df4db3f24c4a5c3b809ead Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 26 Jan 2021 21:57:03 +0100 Subject: [PATCH] libxc: 4.3.4 -> 5.1.0 --- pkgs/development/libraries/libxc/default.nix | 25 +++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index d26518c7de9..0a93babb459 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -1,32 +1,39 @@ -{ lib, stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: let - version = "4.3.4"; + version = "5.1.0"; in stdenv.mkDerivation { pname = "libxc"; inherit version; - src = fetchurl { - url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; - sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8"; + + src = fetchFromGitLab { + owner = "libxc"; + repo = "libxc"; + rev = version; + sha256 = "0qbxh0lfx4cab1fk1qfnx72g4yvs376zqrq74jn224vy32nam2x7"; }; buildInputs = [ gfortran ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl cmake ]; preConfigure = '' patchShebangs ./ ''; - configureFlags = [ "--enable-shared" ]; + cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd) + ''; doCheck = true; enableParallelBuilding = true; meta = with lib; { description = "Library of exchange-correlation functionals for density-functional theory"; - homepage = "https://octopus-code.org/wiki/Libxc"; - license = licenses.lgpl3; + homepage = "https://www.tddft.org/programs/Libxc/"; + license = licenses.mpl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ markuskowa ]; };