tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

libdvdcss: add darwin support

Ryan Artecona dad6db24 a387a5d8

+7 -3
unified split
+4 -2
pkgs/development/libraries/libdvdcss/default.nix
··· 1 - { stdenv, fetchurl }: 2 3 stdenv.mkDerivation rec { 4 name = "libdvdcss-${version}"; 5 version = "1.4.0"; 6 7 src = fetchurl { 8 url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2"; ··· 13 homepage = http://www.videolan.org/developers/libdvdcss.html; 14 description = "A library for decrypting DVDs"; 15 license = licenses.gpl2; 16 - platforms = platforms.linux; 17 }; 18 }
··· 1 + {stdenv, fetchurl, IOKit}: 2 3 stdenv.mkDerivation rec { 4 name = "libdvdcss-${version}"; 5 version = "1.4.0"; 6 + 7 + buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; 8 9 src = fetchurl { 10 url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2"; ··· 15 homepage = http://www.videolan.org/developers/libdvdcss.html; 16 description = "A library for decrypting DVDs"; 17 license = licenses.gpl2; 18 + platforms = with platforms; linux ++ darwin; 19 }; 20 }
+3 -1
pkgs/top-level/all-packages.nix
··· 7545 7546 libdwg = callPackage ../development/libraries/libdwg { }; 7547 7548 - libdvdcss = callPackage ../development/libraries/libdvdcss { }; 7549 7550 libdvdnav = callPackage ../development/libraries/libdvdnav { }; 7551 libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix {
··· 7545 7546 libdwg = callPackage ../development/libraries/libdwg { }; 7547 7548 + libdvdcss = callPackage ../development/libraries/libdvdcss { 7549 + inherit (darwin) IOKit; 7550 + }; 7551 7552 libdvdnav = callPackage ../development/libraries/libdvdnav { }; 7553 libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix {