public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86165 from jtojnar/libusb-compat-rename

Browse Source
This commit is contained in:
Jan Tojnar
2020-04-29 08:26:08 +02:00
committed by GitHub
parent 6015d03ef1 45edbeb81d
commit 2b5e2ffe0a
61 changed files with 129 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/blockchains/monero-gui/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@
, qtquickcontrols, qtquickcontrols2
, monero, unbound, readline, boost, libunwind
, libsodium, pcsclite, zeromq, cppzmq
, hidapi, libusb, protobuf, randomx
, hidapi, libusb-compat-0_1, protobuf, randomx
}:
with stdenv.lib;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
qtxmlpatterns
monero unbound readline
boost libunwind libsodium pcsclite zeromq
cppzmq hidapi libusb protobuf randomx
cppzmq hidapi libusb-compat-0_1 protobuf randomx
];
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];
pkgs/applications/blockchains/monero/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, cmake, pkgconfig
, boost, miniupnpc, openssl, unbound, cppzmq
, zeromq, pcsclite, readline, libsodium, hidapi
, pythonProtobuf, randomx, rapidjson, libusb
, pythonProtobuf, randomx, rapidjson, libusb-compat-0_1
, CoreData, IOKit, PCSC
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline
libsodium hidapi randomx rapidjson
pythonProtobuf libusb
pythonProtobuf libusb-compat-0_1
] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
cmakeFlags = [