diff options
author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-05-01 16:23:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-01 16:23:35 +0200 |
commit | 30d044f8235dbd03675bef6e2b59e1c8a94e2c51 (patch) | |
tree | c098c4ed089da107cc60227ae2e65c22ff76bd40 | |
parent | ccc55641352aa0a58ee42cb32de3a55ea02deff8 (diff) | |
parent | 616f7e3b7e9287ac309f1d397d76aebe22b02d4e (diff) |
Merge pull request #295055 from TomaSajt/libbluray
libbluray: fix build using withJava, make java build deterministic
-rw-r--r-- | pkgs/development/libraries/libbluray/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index bc10d06b846cc..552259ce3babe 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, fontconfig, autoreconfHook, DiskArbitration -, withJava ? false, jdk, ant +, withJava ? false, jdk17, ant, stripJavaArchivesHook , withAACS ? false, libaacs , withBDplus ? false, libbdplus , withMetadata ? true, libxml2 @@ -19,23 +19,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ] - ++ lib.optionals withJava [ ant ]; + ++ lib.optionals withJava [ jdk17 ant stripJavaArchivesHook ]; buildInputs = [ fontconfig ] - ++ lib.optional withJava jdk ++ lib.optional withMetadata libxml2 ++ lib.optional withFonts freetype ++ lib.optional stdenv.isDarwin DiskArbitration; propagatedBuildInputs = lib.optional withAACS libaacs; - NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs" + env.NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs" + lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus"; - preConfigure = lib.optionalString withJava '' - export JDK_HOME="${jdk.home}" - ''; - configureFlags = lib.optional (!withJava) "--disable-bdjava-jar" ++ lib.optional (!withMetadata) "--without-libxml2" ++ lib.optional (!withFonts) "--without-freetype"; |