diff options
author | Florian Klink <flokli@flokli.de> | 2020-04-24 23:39:32 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-04-27 12:19:12 +0200 |
commit | 88048e3213e45b586abb9deae4c696cf6b8f1d42 (patch) | |
tree | 2acf042313bf8e6cacfb69f545f0ad1af8c31136 | |
parent | d0b9aa6fa28b55983e7cf2fa00f68b95d50f9ff8 (diff) | |
download | nixlib-88048e3213e45b586abb9deae4c696cf6b8f1d42.tar nixlib-88048e3213e45b586abb9deae4c696cf6b8f1d42.tar.gz nixlib-88048e3213e45b586abb9deae4c696cf6b8f1d42.tar.bz2 nixlib-88048e3213e45b586abb9deae4c696cf6b8f1d42.tar.lz nixlib-88048e3213e45b586abb9deae4c696cf6b8f1d42.tar.xz nixlib-88048e3213e45b586abb9deae4c696cf6b8f1d42.tar.zst nixlib-88048e3213e45b586abb9deae4c696cf6b8f1d42.zip |
brickd: request libusb1 directly
-rw-r--r-- | pkgs/servers/brickd/default.nix | 4 | ||||
-rw-r--r-- | 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; |