diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-06-03 11:38:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-03 11:38:51 -0400 |
| commit | 7eff5d509de868727135f5be6cb7ba475ab13f69 (patch) | |
| tree | e4c99c335d5cdbecb1cea1f2dadd6cc1ac00ba31 /pkgs/by-name/ja | |
| parent | a3fad6299c4e463de494db1fda458b07b3ed99d0 (diff) | |
| parent | 19674ecb5cac26a84703848237a84658a9f85d5e (diff) | |
Merge pull request #314613 from NickCao/jasper-cross
jasper: fix cross compilation
Diffstat (limited to 'pkgs/by-name/ja')
| -rw-r--r-- | pkgs/by-name/ja/jasper/package.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 11a298208f567..29fd8fd5a9e62 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -55,6 +55,14 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + # The value of __STDC_VERSION__ cannot be automatically determined when cross-compiling + # https://github.com/jasper-software/jasper/blob/87668487/CMakeLists.txt#L415 + # workaround taken from + # https://github.com/openembedded/meta-openembedded/blob/907b9c0a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb#L16 + preConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + cmakeFlagsArray+=(-DJAS_STDC_VERSION="$(echo __STDC_VERSION__ | $CXX -E -P -)") + ''; + meta = { homepage = "https://jasper-software.github.io/jasper/"; description = "Image processing/coding toolkit"; @@ -79,9 +87,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "jasper"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - # The value of __STDC_VERSION__ cannot be automatically determined when - # cross-compiling. - broken = stdenv.buildPlatform != stdenv.hostPlatform; }; }) # TODO: investigate opengl support |