Skip to content

Commit

Permalink
libjpeg_turbo: fix cross to compatible platforms
Browse files Browse the repository at this point in the history
Fixes e.g. pkgsStatic.libjpeg_turbo.

Link: NixOS#251853 (comment)
  • Loading branch information
alyssais committed Feb 2, 2024
1 parent 1328c58 commit 45581ad
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion pkgs/development/libraries/libjpeg-turbo/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, nasm
, openjdk
Expand Down Expand Up @@ -41,8 +42,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-xHjd0WHN50b75wdWPHUwfmJGsiWKmj+zA59UwakIo74=";
};

# This is needed by freeimage
patches = [
(fetchpatch {
name = "CMAKE_CROSSCOMPILING_EMULATOR=env-fix.patch";
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/compare/36c51dd3eb60ebde3ca77d3cfa7df3422f1aaaf1..b6ee1016abbc55116304ad396cf88aa19391e10a.patch";
hash = "sha256-dNwXicvZEsG02TBaM5nYMlZ+VczT/Dfx6ZM/6huZpwE=";
})

# This is needed by freeimage
./0001-Compile-transupp.c-as-part-of-the-library.patch
] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
./0002-Make-exported-symbols-in-transupp.c-weak.patch
Expand Down

0 comments on commit 45581ad

Please sign in to comment.