jxrlib: 1.1 -> 1.2~git20170615.f752187-5.2, fix warning flags for GCC…

… 14; colmap: unpin Boost (#359356)
NixOS · Dec 28, 2024 · f56cbb9 · f56cbb9
2 parents a881f99 + 353717d
commit f56cbb9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 31 deletions.
diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen,
+{ lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen,
   freeimage, glog, libGLU, glew, qtbase,
   flann,
   cgal,
@@ -17,7 +17,7 @@
 assert cudaSupport -> cudaPackages != { };
 
 let
-  boost_static = boost179.override { enableStatic = true; };
+  boost_static = boost.override { enableStatic = true; };
   stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv;
 
   # TODO: migrate to redist packages

diff --git a/pkgs/by-name/jx/jxrlib/package.nix b/pkgs/by-name/jx/jxrlib/package.nix
@@ -1,40 +1,29 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
+{ lib, stdenv, fetchFromGitLab, cmake, ninja, quilt }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "jxrlib";
-  version = "1.1";
+  version = "1.2~git20170615.f752187-5.2";
 
-  # Use the source from a fork on github because CodePlex does not
-  # deliver an easily downloadable tarball.
-  src = fetchFromGitHub {
-    owner = "4creators";
-    repo = pname;
-    rev = "f7521879862b9085318e814c6157490dd9dbbdb4";
-    sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "debian-phototools-team";
+    repo = "jxrlib";
+    rev = "56e10e601a962c2e8d178e60e52cd8cf2d50f9c0";
+    hash = "sha256-BX4kLlFk8AfouKE9KDyG1EFFYLFB/HqYQRxFdjAe2J8=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/df96f9b9c1fbe9cdc97589c337f8a948bc81c4d0/debian/patches/usecmake.patch";
-      sha256 = "sha256-BpCToLgA5856PZk5mXlwAy3Oh9aYP/2wvu2DXDTqufM=";
-    })
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/6c88037293aff8d5bc8a76ea32b36781c430ede3/debian/patches/bug803743.patch";
-      sha256 = "sha256-omIGa+ZrWjaH/IkBn4jgjufF/HEDKw69anVCX4hw+xQ=";
-    })
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/b23d49062ec6a9b2739c9dade86be525a72fc807/debian/patches/pkg-config.patch";
-      sha256 = "sha256-ZACaXEi+rbKIFBHtSBheyFfqV2HYsKKrT+SmTShyUhg=";
-    })
-  ];
-
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ninja quilt ];
 
   strictDeps = true;
 
-  env = lib.optionalAttrs stdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
-  };
+  env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " (
+    [ "-Wno-error=implicit-function-declaration"]
+    ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ]
+  );
+
+  postPatch = ''
+    QUILT_PATCHES=debian/patches quilt push -a
+  '';
 
   meta = with lib; {
     description = "Implementation of the JPEG XR image codec standard";