Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4b5558b7ddef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1585c230bed7
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 29, 2019

  1. librealsense: 2.25.0 -> 2.29.0 (#69657) 

    * librealsense: 2.25.0 -> 2.28.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/librealsense/versions

* librealsense: 2.28.0 -> 2.29.0
+ split libs and includes into multiple outputs
+ use libusb 1.x and not libusb-compat
    @r-ryantm @c0bw3b
    r-ryantm authored and c0bw3b committed Nov 29, 2019
    Copy the full SHA
    1585c23 View commit details
Showing with 9 additions and 7 deletions.
  1. +9 −7 pkgs/development/libraries/librealsense/default.nix
16 changes: 9 additions & 7 deletions pkgs/development/libraries/librealsense/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{ stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}:
{ stdenv, fetchFromGitHub, cmake, libusb1, ninja, pkgconfig }:

stdenv.mkDerivation rec {
pname = "librealsense";
version = "2.25.0";
version = "2.29.0";

outputs = [ "out" "dev" ];

src = fetchFromGitHub {
owner = "IntelRealSense";
repo = "librealsense";
repo = pname;
rev = "v${version}";
sha256 = "029qps0bbck0m2xj0mb5g3pgkk7a1zq8wcilfkvpx72sn7039xvw";
sha256 = "0wrg1c4fcd5ky96hmnczg9izfgd0yxls8ghxxzrdvgdlg269f443";
};

buildInputs = [
libusb
libusb1
];

nativeBuildInputs = [
@@ -25,9 +27,9 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)";
homepage = https://github.com/IntelRealSense/librealsense;
homepage = "https://github.com/IntelRealSense/librealsense";
license = licenses.asl20;
maintainers = with maintainers; [ brian-dawn ];
platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
};
}