diff --git a/pkgs/by-name/dl/dlib/package.nix b/pkgs/by-name/dl/dlib/package.nix index 8fca85081b32..16c34f2168dc 100644 --- a/pkgs/by-name/dl/dlib/package.nix +++ b/pkgs/by-name/dl/dlib/package.nix @@ -20,13 +20,13 @@ }@inputs: (if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec { pname = "dlib"; - version = "19.24.6"; + version = "19.24.8"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; tag = "v${version}"; - sha256 = "sha256-BpE7ZrtiiaDqwy1G4IHOQBJMr6sAadFbRxsdObs1SIY="; + sha256 = "sha256-b8DFlfBnF4Fk7beJPxQJDVHaCR7s5/4uAPi3RV9cBZ4="; }; postPatch = '' diff --git a/pkgs/by-name/vi/viennarna/package.nix b/pkgs/by-name/vi/viennarna/package.nix index c8e08c2a2d38..61cf15ea0db0 100644 --- a/pkgs/by-name/vi/viennarna/package.nix +++ b/pkgs/by-name/vi/viennarna/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + dlib, gsl, mpfr, perl, @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { hash = "sha256-mpn9aO04CJTe+01eaooocWKScAKM338W8KBdpujHFHM="; }; + # use nixpkgs dlib sources instead of bundled ones + # using dlib-19.24.8 fixes the build with modern compilers (such as clang-19) + postPatch = '' + rm -rf ./src/dlib-19.24 + cp -a ${dlib.src} ./src/dlib-19.24 + find ./src/dlib-19.24 -type d -exec chmod +w {} \; + ''; + buildInputs = [ gsl mpfr