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

Merge pull request #111044 from veprbl/pr/libusb1_remove_assert

Browse Source
This commit is contained in:
Sandro 2021-01-28 22:58:53 +01:00 committed by GitHub
commit 8e40bbc4b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/dbus/default.nix
View File

@ -17,12 +17,6 @@
, xmlto , xmlto
}: }:
assert
x11Support ->
libX11 != null && libICE != null && libSM != null;
assert enableSystemd -> systemd != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dbus"; pname = "dbus";
version = "1.12.20"; version = "1.12.20";

4
pkgs/development/libraries/libusb1/default.nix
View File

@ -3,14 +3,12 @@
, autoreconfHook , autoreconfHook
, pkg-config , pkg-config
, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
, udev ? null , udev
, libobjc , libobjc
, IOKit , IOKit
, withStatic ? false , withStatic ? false
}: }:
assert enableUdev -> udev != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libusb"; pname = "libusb";
version = "1.0.24"; version = "1.0.24";

4
pkgs/misc/cups/default.nix
View File

@ -9,7 +9,7 @@
, pam , pam
, dbus , dbus
, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
, systemd ? null , systemd
, acl , acl
, gmp , gmp
, darwin , darwin
@ -20,8 +20,6 @@
, coreutils , coreutils
}: }:
assert enableSystemd -> systemd != null;
### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test ### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test
### works at least for your platform. ### works at least for your platform.