mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 20:21:14 +00:00
Code Issues Wiki Activity

Merge pull request #277651 from natsukium/rdkit/update

Browse source 
python311Packages.rdkit: 2023.09.1 -> 2023.09.3; coordgenlibs: fix build with clang
This commit is contained in:
OTABI Tomoya 2023-12-31 10:02:02 +09:00 committed by GitHub
parent 8ae636c59b 07964df9f5
commit c10df0fb3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/libraries/coordgenlibs/default.nix
View file

@ -7,23 +7,31 @@
, maeparser , maeparser
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "coordgenlibs"; pname = "coordgenlibs";
version = "3.0.2"; version = "3.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "schrodinger"; owner = "schrodinger";
repo = pname; repo = "coordgenlibs";
rev = "v${version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-casFPNbPv9mkKpzfBENW7INClypuCO1L7clLGBXvSvI="; hash = "sha256-casFPNbPv9mkKpzfBENW7INClypuCO1L7clLGBXvSvI=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ boost zlib maeparser ]; buildInputs = [ boost zlib maeparser ];
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_CFLAGS_COMPILE = "-Wno-unused-but-set-variable";
};
doCheck = true;
meta = with lib; { meta = with lib; {
description = "Schrodinger-developed 2D Coordinate Generation"; description = "Schrodinger-developed 2D Coordinate Generation";
homepage = "https://github.com/schrodinger/coordgenlibs";
changelog = "https://github.com/schrodinger/coordgenlibs/releases/tag/${finalAttrs.version}";
maintainers = [ maintainers.rmcgibbo ]; maintainers = [ maintainers.rmcgibbo ];
license = licenses.bsd3; license = licenses.bsd3;
}; };
} })

10
pkgs/development/python-modules/rdkit/default.nix
View file

@ -5,7 +5,7 @@
, cmake , cmake
, comic-neue , comic-neue
, boost , boost
, catch2 , catch2_3
, inchi , inchi
, cairo , cairo
, eigen , eigen
@ -42,8 +42,8 @@ let
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "rdkit"; pname = "rdkit";
version = "2023.09.1"; version = "2023.09.3";
format = "other"; pyproject = false;
src = src =
let let
@ -53,7 +53,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "Release_${versionTag}"; rev = "Release_${versionTag}";
hash = "sha256-qaYD/46oCTnso1FbD08zr2JuatKmSSqNBhOYlfeIiAA="; hash = "sha256-bewOdmpnm6cArD5iaMKNqT8z4GUIpih+JzJ+wdo/lrI=";
}; };
unpackPhase = '' unpackPhase = ''
@ -84,6 +84,7 @@ buildPythonPackage rec {
buildInputs = [ buildInputs = [
boost boost
cairo cairo
catch2_3
] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [
memorymappingHook memorymappingHook
]; ];
@ -109,7 +110,6 @@ buildPythonPackage rec {
''; '';
cmakeFlags = [ cmakeFlags = [
"-DCATCH_DIR=${catch2}/include/catch2"
"-DINCHI_LIBRARY=${inchi}/lib/libinchi.so" "-DINCHI_LIBRARY=${inchi}/lib/libinchi.so"
"-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so" "-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so"
"-DINCHI_INCLUDE_DIR=${inchi}/include/inchi" "-DINCHI_INCLUDE_DIR=${inchi}/include/inchi"