From d4d7a06796c2be32eefe9d325a815bd5b875b230 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Apr 2026 17:57:14 +0200 Subject: [PATCH] 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. --- pkgs/development/haskell-modules/configuration-common.nix | 2 -- pkgs/development/haskell-modules/configuration-nix.nix | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 067a861eb2a7..2c07385cb49a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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 # ipa = doJailbreak super.ipa; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e033f037b99c..82574796ebc6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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;