diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
| commit | 6b8e2555ef013b579cda57025b17d662e0f1fe1f (patch) | |
| tree | 5a83c673af26c9976acd5a5dfa20e09e06898047 /nixpkgs/pkgs/development/libraries/libbluray | |
| parent | 66ca7a150b5c051f0728f13134e6265cc46f370c (diff) | |
| parent | 02357adddd0889782362d999628de9d309d202dc (diff) | |
| download | nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.gz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.bz2 nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.lz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.xz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.zst nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libbluray')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch deleted file mode 100644 index d3dec2936c50..000000000000 --- a/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5007bbd..f46de1a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -253,7 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [ - ]) - - AS_IF([test "x$use_bdjava_jar" = "xyes"], [ -- -+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" - dnl check for ant - AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) - AS_IF([test "x$HAVE_ANT" = "xno"], [ -diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c -index 1cb1bfe..f3711c2 100644 ---- a/src/libbluray/bdj/bdj.c -+++ b/src/libbluray/bdj/bdj.c -@@ -533,6 +533,9 @@ static char *_find_libbluray_jar0() - # ifdef __FreeBSD__ - "/usr/local/share/java/" BDJ_JARFILE, - # else -+# ifdef JARDIR -+ JARDIR "/" BDJ_JARFILE, -+# endif - "/usr/share/java/" BDJ_JARFILE, - "/usr/share/libbluray/lib/" BDJ_JARFILE, - # endif |