haskellPackages.inline-java: move override to configuration-nix
I attempted fixing the build of its dependency, jni, but there is another build problem after correcting the path to libjvm.so.
This commit is contained in:
@@ -865,8 +865,6 @@ with haskellLib;
|
||||
'';
|
||||
}) super.inline-c-cpp;
|
||||
|
||||
inline-java = addBuildDepend pkgs.jdk super.inline-java;
|
||||
|
||||
# Too strict upper bound on unicode-transforms
|
||||
# <https://gitlab.com/ngua/ipa-hs/-/issues/1>
|
||||
ipa = doJailbreak super.ipa;
|
||||
|
||||
@@ -275,11 +275,13 @@ builtins.intersectAttrs super {
|
||||
# jni needs help finding libjvm.so because it's in a weird location.
|
||||
jni = overrideCabal (drv: {
|
||||
preConfigure = ''
|
||||
local libdir=( "${pkgs.jdk}/lib/openjdk/jre/lib/"*"/server" )
|
||||
appendToVar configureFlags "--extra-lib-dir=''${libdir[0]}"
|
||||
local libdir=( "${lib.getLib pkgs.jdk}/lib/openjdk/lib/server" )
|
||||
appendToVar configureFlags "--extra-lib-dirs=''${libdir[0]}"
|
||||
'';
|
||||
}) super.jni;
|
||||
|
||||
inline-java = addBuildDepend pkgs.jdk super.inline-java;
|
||||
|
||||
# Won't find it's header files without help.
|
||||
sfml-audio = appendConfigureFlag "--extra-include-dirs=${pkgs.openal}/include/AL" super.sfml-audio;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user