alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #14534 from ryanartecona/darwin-fix-libsamplerate-libdvdcss

Browse source 
libsamplerate, libdvdcss: fix darwin build
This commit is contained in:
Frederik Rietdijk 2016-10-02 22:23:28 +02:00 committed by GitHub
parent 400910c1f7 dad6db2461
commit 83055b86ce
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/libdvdcss/default.nix
View file

@ -1,9 +1,11 @@
{ stdenv, fetchurl }:
{stdenv, fetchurl, IOKit}:
stdenv.mkDerivation rec {
name = "libdvdcss-${version}";
version = "1.4.0";
buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
src = fetchurl {
url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
sha256 = "0nl45ifc4xcb196snv9d6hinfw614cqpzcqp92dg43c0hickg290";
@ -13,6 +15,6 @@ stdenv.mkDerivation rec {
homepage = http://www.videolan.org/developers/libdvdcss.html;
description = "A library for decrypting DVDs";
license = licenses.gpl2;
platforms = platforms.linux;
platforms = with platforms; linux ++ darwin;
};
}

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

@ -7553,7 +7553,9 @@ in
libdwg = callPackage ../development/libraries/libdwg { };
libdvdcss = callPackage ../development/libraries/libdvdcss { };
libdvdcss = callPackage ../development/libraries/libdvdcss {
inherit (darwin) IOKit;
};
libdvdnav = callPackage ../development/libraries/libdvdnav { };
libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix {