Merge master into staging-next

2 files changed, 10 insertions, 2 deletions

diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix
index 90e6bdaaf37c9..c0860d9a1baf3 100644
--- a/pkgs/development/libraries/physics/apfel/default.nix
+++ b/pkgs/development/libraries/physics/apfel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gfortran, lhapdf, python3, zlib }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, gfortran, lhapdf, python3, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "apfel";
@@ -11,13 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-fRdJ+C92tEC75iUwP9Tmm/EswrlA52eUo5fBjfieH9o=";
   };
 
+  # needed for aarch64-darwin
+  nativeBuildInputs = [ autoreconfHook ];
+
   buildInputs = [ gfortran lhapdf python3 zlib ];
 
   enableParallelBuilding = true;
 
   meta = with lib; {
     description = "A PDF Evolution Library";
-    license     = licenses.gpl3;
+    license     = licenses.gpl3Plus;
     homepage    = "https://apfel.mi.infn.it/";
     platforms   = platforms.unix;
     maintainers = with maintainers; [ veprbl ];
diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix
index 04698cc1a9c06..8310e9444aae2 100644
--- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix
+++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
     "-DRAPIDFUZZ_BUILD_TESTING=ON"
   ];
 
+  CXXFLAGS = lib.optionals stdenv.cc.isClang [
+    # error: no member named 'fill' in namespace 'std'
+    "-include algorithm"
+  ];
+
   checkInputs = [
     catch2_3
   ];