ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 06:47:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #126383 from kamadorueda/master

Browse Source 
ligjpeg-turbo: v7 and 8 abi compatibility
This commit is contained in:
Niklas Hambüchen 2021-06-09 22:47:58 +02:00 committed by GitHub
commit d7d0a67765
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/libjpeg-turbo/default.nix
View File

@ -1,10 +1,18 @@
{ lib, stdenv, fetchFromGitHub, cmake, nasm
{ lib
, stdenv
, fetchFromGitHub
, cmake
, nasm
, openjdk
, enableJava ? false # whether to build the java wrapper
, enableJpeg7 ? false # whether to build libjpeg with v7 compatibility
, enableJpeg8 ? false # whether to build libjpeg with v8 compatibility
, enableStatic ? stdenv.hostPlatform.isStatic
, enableShared ? !stdenv.hostPlatform.isStatic
}:
assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both
stdenv.mkDerivation rec {
pname = "libjpeg-turbo";
@ -20,7 +28,7 @@ stdenv.mkDerivation rec {
# This is needed by freeimage
patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ]
++ lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
./mingw-boolean.patch;
./mingw-boolean.patch;
outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ];
@ -40,6 +48,10 @@ stdenv.mkDerivation rec {
"-DENABLE_SHARED=${if enableShared then "1" else "0"}"
] ++ lib.optionals enableJava [
"-DWITH_JAVA=1"
] ++ lib.optionals enableJpeg7 [
"-DWITH_JPEG7=1"
] ++ lib.optionals enableJpeg8 [
"-DWITH_JPEG8=1"
] ++ lib.optionals stdenv.hostPlatform.isRiscV [
# https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
# https://github.com/libjpeg-turbo/libjpeg-turbo/commit/88bf1d16786c74f76f2e4f6ec2873d092f577c75
@ -53,7 +65,7 @@ stdenv.mkDerivation rec {
homepage = "https://libjpeg-turbo.org/";
description = "A faster (using SIMD) libjpeg implementation";
license = licenses.ijg; # and some parts under other BSD-style licenses
maintainers = with maintainers; [ vcunat colemickens ];
maintainers = with maintainers; [ vcunat colemickens kamadorueda ];
platforms = platforms.all;
};
}