From 817612c13a0da4b3925a0d6776cb1dfb15ed4fdd Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Mon, 18 Dec 2023 14:20:44 +0100 Subject: [PATCH] avogadrolibs: 1.97.0 -> 1.98.1 --- .../science/chemistry/avogadrolibs/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index e23fba7fb0eb..7966cd4be5f6 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "avogadrolibs"; - version = "1.97.0"; + version = "1.98.1"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = pname; rev = version; - hash = "sha256-ZGFyUlFyI403aw/6GVze/gronT67XlEOKuw5sfHeVy8="; + hash = "sha256-BuBMWW7N5Cu9tw5Vpwk+aoIaMWwHViRzLtIG7XDWjN4="; }; postUnpack = '' @@ -53,9 +53,13 @@ in stdenv.mkDerivation rec { qttools ]; - postFixup = '' + # Fix the broken CMake files to use the correct paths + postInstall = '' substituteInPlace $out/lib/cmake/${pname}/AvogadroLibsConfig.cmake \ - --replace "''${AvogadroLibs_INSTALL_PREFIX}/$out" "''${AvogadroLibs_INSTALL_PREFIX}" + --replace "$out/" "" + + substituteInPlace $out/lib/cmake/${pname}/AvogadroLibsTargets.cmake \ + --replace "_IMPORT_PREFIX}/$out" "_IMPORT_PREFIX}/" ''; meta = with lib; {