Merge pull request #111044 from veprbl/pr/libusb1_remove_assert
This commit is contained in:
commit
8e40bbc4b9
3 changed files with 2 additions and 12 deletions
|
@ -17,12 +17,6 @@
|
|||
, xmlto
|
||||
}:
|
||||
|
||||
assert
|
||||
x11Support ->
|
||||
libX11 != null && libICE != null && libSM != null;
|
||||
|
||||
assert enableSystemd -> systemd != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbus";
|
||||
version = "1.12.20";
|
||||
|
|
|
@ -3,14 +3,12 @@
|
|||
, autoreconfHook
|
||||
, pkg-config
|
||||
, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
|
||||
, udev ? null
|
||||
, udev
|
||||
, libobjc
|
||||
, IOKit
|
||||
, withStatic ? false
|
||||
}:
|
||||
|
||||
assert enableUdev -> udev != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libusb";
|
||||
version = "1.0.24";
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
, pam
|
||||
, dbus
|
||||
, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
|
||||
, systemd ? null
|
||||
, systemd
|
||||
, acl
|
||||
, gmp
|
||||
, darwin
|
||||
|
@ -20,8 +20,6 @@
|
|||
, coreutils
|
||||
}:
|
||||
|
||||
assert enableSystemd -> systemd != null;
|
||||
|
||||
### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test
|
||||
### works at least for your platform.
|
||||
|
||||
|
|
Loading…
Reference in a new issue