lol

Merge pull request #240500 from fortuneteller2k/molsketch

authored by

Sandro and committed by
GitHub
29f5e51d a21c873f

+18 -4
+18 -4
pkgs/applications/editors/molsketch/default.nix
··· 1 1 { lib 2 - , stdenv 3 2 , mkDerivation 4 3 , fetchurl 5 4 , cmake 6 5 , pkg-config 6 + , wrapQtAppsHook 7 7 , hicolor-icon-theme 8 8 , openbabel 9 9 , desktop-file-utils ··· 12 12 13 13 mkDerivation rec { 14 14 pname = "molsketch"; 15 - version = "0.7.3"; 15 + version = "0.8.0"; 16 16 17 17 src = fetchurl { 18 18 url = "mirror://sourceforge/molsketch/Molsketch-${version}-src.tar.gz"; 19 - hash = "sha256-82iNJRiXqESwidjifKBf0+ljcqbFD1WehsXI8VUgrwQ="; 19 + hash = "sha256-Mpx4fHktxqBAkmdwqg2pXvEgvvGUQPbgqxKwXKjhJuQ="; 20 20 }; 21 21 22 + # uses C++17 APIs like std::transform_reduce 23 + postPatch = '' 24 + substituteInPlace molsketch/CMakeLists.txt \ 25 + --replace "CXX_STANDARD 14" "CXX_STANDARD 17" 26 + substituteInPlace libmolsketch/CMakeLists.txt \ 27 + --replace "CXX_STANDARD 14" "CXX_STANDARD 17" 28 + substituteInPlace obabeliface/CMakeLists.txt \ 29 + --replace "CXX_STANDARD 14" "CXX_STANDARD 17" 30 + ''; 31 + 22 32 preConfigure = '' 23 33 cmakeFlags="$cmakeFlags -DMSK_PREFIX=$out" 24 34 ''; 25 35 26 - nativeBuildInputs = [ cmake pkg-config ]; 36 + postFixup = '' 37 + mv $out/lib/molsketch/* $out/lib 38 + ''; 39 + 40 + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; 27 41 buildInputs = [ 28 42 hicolor-icon-theme 29 43 openbabel