From 88048e3213e45b586abb9deae4c696cf6b8f1d42 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 24 Apr 2020 23:39:32 +0200 Subject: [PATCH] brickd: request libusb1 directly --- pkgs/servers/brickd/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index b6c5b2a60af3..4b18e73284f9 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb, pkgconfig, pmutils, udev} : +{ stdenv, fetchgit, libusb1, pkgconfig, pmutils, udev} : let @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb pmutils udev ]; + buildInputs = [ libusb1 pmutils udev ]; # shell thing didn't work so i replaced it using nix prePatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fe75fa63915..0dc77f5165fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5874,9 +5874,7 @@ in briss = callPackage ../tools/graphics/briss { }; - brickd = callPackage ../servers/brickd { - libusb = libusb1; - }; + brickd = callPackage ../servers/brickd { }; bully = callPackage ../tools/networking/bully { openssl = openssl_1_0_2;