diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:49:34 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:49:34 -0700 |
| commit | 2c9823713a64d67d91405edc71d2835682acbf25 (patch) | |
| tree | 6a74b47779ca7e823a902eb6a56767ce9615a998 /pkgs/development | |
| parent | 001f3933aeb85f2f3ff9121e97e23b294a336da5 (diff) | |
| parent | 041e3b46adde5404a568b6476f2648aa58cda12c (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libass/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libdc1394/default.nix | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 7dda6912a986e..2a9af50fcde98 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Portable ASS/SSA subtitle renderer"; homepage = https://github.com/libass/libass; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel urkud ]; repositories.git = git://github.com/libass/libass.git; }; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index afde4e260e8f3..1d6b00abe539a 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa"; }; - buildInputs = [ libraw1394 libusb1 ]; + buildInputs = [ libusb1 ] + ++ stdenv.lib.optional stdenv.isLinux [ libraw1394 ]; meta = { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } |