lol

jxrlib: 1.1 -> 1.2~git20170615.f752187-5.2, fix warning flags for GCC 14; colmap: unpin Boost (#359356)

authored by

Emily and committed by
GitHub
f56cbb9a a881f99f

+20 -31
+2 -2
pkgs/applications/science/misc/colmap/default.nix
··· 1 - { lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, 1 + { lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen, 2 2 freeimage, glog, libGLU, glew, qtbase, 3 3 flann, 4 4 cgal, ··· 17 17 assert cudaSupport -> cudaPackages != { }; 18 18 19 19 let 20 - boost_static = boost179.override { enableStatic = true; }; 20 + boost_static = boost.override { enableStatic = true; }; 21 21 stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv; 22 22 23 23 # TODO: migrate to redist packages
+18 -29
pkgs/by-name/jx/jxrlib/package.nix
··· 1 - { lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: 1 + { lib, stdenv, fetchFromGitLab, cmake, ninja, quilt }: 2 2 3 - stdenv.mkDerivation rec { 3 + stdenv.mkDerivation { 4 4 pname = "jxrlib"; 5 - version = "1.1"; 5 + version = "1.2~git20170615.f752187-5.2"; 6 6 7 - # Use the source from a fork on github because CodePlex does not 8 - # deliver an easily downloadable tarball. 9 - src = fetchFromGitHub { 10 - owner = "4creators"; 11 - repo = pname; 12 - rev = "f7521879862b9085318e814c6157490dd9dbbdb4"; 13 - sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w"; 7 + src = fetchFromGitLab { 8 + domain = "salsa.debian.org"; 9 + owner = "debian-phototools-team"; 10 + repo = "jxrlib"; 11 + rev = "56e10e601a962c2e8d178e60e52cd8cf2d50f9c0"; 12 + hash = "sha256-BX4kLlFk8AfouKE9KDyG1EFFYLFB/HqYQRxFdjAe2J8="; 14 13 }; 15 14 16 - patches = [ 17 - (fetchpatch { 18 - url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/df96f9b9c1fbe9cdc97589c337f8a948bc81c4d0/debian/patches/usecmake.patch"; 19 - sha256 = "sha256-BpCToLgA5856PZk5mXlwAy3Oh9aYP/2wvu2DXDTqufM="; 20 - }) 21 - (fetchpatch { 22 - url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/6c88037293aff8d5bc8a76ea32b36781c430ede3/debian/patches/bug803743.patch"; 23 - sha256 = "sha256-omIGa+ZrWjaH/IkBn4jgjufF/HEDKw69anVCX4hw+xQ="; 24 - }) 25 - (fetchpatch { 26 - url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/b23d49062ec6a9b2739c9dade86be525a72fc807/debian/patches/pkg-config.patch"; 27 - sha256 = "sha256-ZACaXEi+rbKIFBHtSBheyFfqV2HYsKKrT+SmTShyUhg="; 28 - }) 29 - ]; 15 + nativeBuildInputs = [ cmake ninja quilt ]; 30 16 31 - nativeBuildInputs = [ cmake ]; 17 + strictDeps = true; 32 18 33 - strictDeps = true; 19 + env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( 20 + [ "-Wno-error=implicit-function-declaration"] 21 + ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ] 22 + ); 34 23 35 - env = lib.optionalAttrs stdenv.cc.isClang { 36 - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; 37 - }; 24 + postPatch = '' 25 + QUILT_PATCHES=debian/patches quilt push -a 26 + ''; 38 27 39 28 meta = with lib; { 40 29 description = "Implementation of the JPEG XR image codec standard";