mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

Merge pull request #84461 from marsam/fix-libbluray-build

Browse source 
libbluray: fix build on darwin
This commit is contained in:
Mario Rodas 2020-04-06 20:13:09 -05:00 committed by GitHub
parent 1401aa9270 bee7f216b5
commit 55d2a340d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/libbluray/default.nix
View file

@ -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;

4
pkgs/top-level/all-packages.nix
View file

@ -12394,7 +12394,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 { };