From 24bae16e716847b3474c463d9e39244e49f7a29a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 28 Jan 2021 15:38:17 -0500 Subject: [PATCH 1/3] libusb1: remove assert that breaks udev = null deep override This is another case of #73102 --- pkgs/development/libraries/libusb1/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 33cd34ea5a0e..d69c8d670c4a 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -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"; From 1fbb13bc85a392bc130487fecbb99c18972b8a24 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 28 Jan 2021 15:43:37 -0500 Subject: [PATCH 2/3] dbus: remove assert that breaks systemd = null deep override This is another case of #73102 --- pkgs/development/libraries/dbus/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 1f1eff189598..fd7df4d5ba37 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -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"; From c457d983c7b2ced3ced60787ff34fbacdbc613ab Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 28 Jan 2021 15:56:25 -0500 Subject: [PATCH 3/3] cups: remove assert that breaks systemd = null deep override This is another case of #73102 --- pkgs/misc/cups/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 0d740e071e11..3812ae500e5c 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -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.