diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libbluray/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libbluray/default.nix | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/nixpkgs/pkgs/development/libraries/libbluray/default.nix index 5b262c66e18e..bc10d06b846c 100644 --- a/nixpkgs/pkgs/development/libraries/libbluray/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk, ant , withAACS ? false, libaacs , withBDplus ? false, libbdplus @@ -6,51 +6,39 @@ , withFonts ? true, freetype }: -with lib; - # Info on how to use: # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { pname = "libbluray"; - version = "1.3.1"; + version = "1.3.4"; src = fetchurl { - url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-wksPQcW3N7u2XFRP5jSVY3p3HBClGd/IAudp8RK0O3U="; + url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-R4/9aKD13ejvbKmJt/A1taCiLFmRQuXNP/ewO76+Xys="; }; - patches = [ - ./BDJ-JARFILE-path.patch - ./libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch - ]; - nativeBuildInputs = [ pkg-config autoreconfHook ] - ++ optionals withJava [ ant ]; + ++ lib.optionals withJava [ ant ]; buildInputs = [ fontconfig ] - ++ optional withJava jdk - ++ optional withMetadata libxml2 - ++ optional withFonts freetype - ++ optional stdenv.isDarwin DiskArbitration - ; + ++ lib.optional withJava jdk + ++ lib.optional withMetadata libxml2 + ++ lib.optional withFonts freetype + ++ lib.optional stdenv.isDarwin DiskArbitration; - propagatedBuildInputs = optional withAACS libaacs; + propagatedBuildInputs = lib.optional withAACS libaacs; - NIX_LDFLAGS = toString [ - (optionalString withAACS "-L${libaacs}/lib -laacs") - (optionalString withBDplus "-L${libbdplus}/lib -lbdplus") - ]; + NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs" + + lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus"; - preConfigure = '' - ${optionalString withJava ''export JDK_HOME="${jdk.home}"''} + preConfigure = lib.optionalString withJava '' + export JDK_HOME="${jdk.home}" ''; - configureFlags = with lib; - optional (! withJava) "--disable-bdjava-jar" - ++ optional (! withMetadata) "--without-libxml2" - ++ optional (! withFonts) "--without-freetype" - ; + configureFlags = lib.optional (!withJava) "--disable-bdjava-jar" + ++ lib.optional (!withMetadata) "--without-libxml2" + ++ lib.optional (!withFonts) "--without-freetype"; meta = with lib; { homepage = "http://www.videolan.org/developers/libbluray.html"; |