movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-06-12 10:44:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

openni2: Use libjpeg from nixpkgs

Browse source 
The vendored version of libjpeg fails to build with errors like this:

../../ThirdParty/LibJPEG/jccolor.c:135:3: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
  135 |   register int r, g, b;
      |   ^~~~~~~~
This commit is contained in:
Michal Sojka 2024-09-19 10:53:07 +02:00 • committed by Ben Wolsieffer
parent 1449b831a7
commit e9fc4018ea
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pkgs/openni2/default.nix
View file

@ -1,5 +1,5 @@
{ lib, clangStdenv, fetchurl, fetchFromGitHub, libusb1, jdk, python3, doxygen { lib, clangStdenv, fetchurl, fetchFromGitHub, libusb1, jdk, python3, doxygen
, libGLU, xorg, freeglut }: , libGLU, xorg, freeglut, fetchDebianPatch, libjpeg }:
let let
libopenni2_pc = fetchurl { libopenni2_pc = fetchurl {
@ -17,8 +17,17 @@ in clangStdenv.mkDerivation rec {
sha256 = "0mfnyzpq53wnzgjfx91xcbx0nrl0lp1vrk1rk20a3gb3kshsr675"; sha256 = "0mfnyzpq53wnzgjfx91xcbx0nrl0lp1vrk1rk20a3gb3kshsr675";
}; };
patches = [
(fetchDebianPatch {
inherit pname;
version = "${version}+dfsg-18";
patch = "0003-Use-system-wide-libjpeg.patch";
hash = "sha256-Y4K70tqmbQDIsNCau/XZyNJL5RfBa/VW6xG5+M6XW6Q=";
})
];
nativeBuildInputs = [ jdk python3 doxygen ]; nativeBuildInputs = [ jdk python3 doxygen ];
buildInputs = [ libusb1 libGLU xorg.libX11 freeglut ]; buildInputs = [ libusb1 libGLU xorg.libX11 freeglut libjpeg ];
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];