dlib: 19.24.6 -> 19.24.8 (NixOS#388805)

emaryn · Mar 10, 2025 · bd972a6 · bd972a6
2 parents c48d29d + b8270cd
commit bd972a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -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