From bee7f216b5d9576b95b37ea9673e1acf1dfc5c91 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 6 Apr 2020 04:20:00 -0500 Subject: [PATCH] libbluray: fix build on darwin --- pkgs/development/libraries/libbluray/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index b66e3fd28e73..7bfd9a8a2d02 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook +{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk ? null, ant ? null , withAACS ? false, libaacs ? null , withBDplus ? false, libbdplus ? null @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { ++ optional withJava jdk ++ optional withMetadata libxml2 ++ optional withFonts freetype + ++ optional stdenv.isDarwin DiskArbitration ; propagatedBuildInputs = optional withAACS libaacs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 353860cfd0ac..aba04ec31074 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12390,7 +12390,9 @@ in libblocksruntime = callPackage ../development/libraries/libblocksruntime { }; - libbluray = callPackage ../development/libraries/libbluray { }; + libbluray = callPackage ../development/libraries/libbluray { + inherit (darwin.apple_sdk.frameworks) DiskArbitration; + }; libbs2b = callPackage ../development/libraries/audio/libbs2b { };