From 04e9977b41b789949761c1d4a9656f5cf6f3838b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 28 Apr 2021 13:29:26 -0400 Subject: [PATCH] gtk*: remove assert cupsSupport -> cups != null --- pkgs/development/libraries/gtk/2.x.nix | 5 +---- pkgs/development/libraries/gtk/3.x.nix | 4 +--- pkgs/development/libraries/gtk/4.x.nix | 4 +--- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 8f50c922f514..ea112b3d33ce 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -1,15 +1,12 @@ { config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg , gdk-pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux -, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null +, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch }: -assert xineramaSupport -> xorg.libXinerama != null; -assert cupsSupport -> cups != null; - with lib; let diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 0d4bec5f3441..9f7d30505248 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -42,14 +42,12 @@ , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux , withGtkDoc ? stdenv.isLinux -, cups ? null +, cups , AppKit , Cocoa , broadwaySupport ? true }: -assert cupsSupport -> cups != null; - let gtkCleanImmodulesCache = substituteAll { diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index b64b8bc36fde..50b322c9dbaf 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -46,14 +46,12 @@ , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux , withGtkDoc ? stdenv.isLinux -, cups ? null +, cups , AppKit , Cocoa , broadwaySupport ? true }: -assert cupsSupport -> cups != null; - let gtkCleanImmodulesCache = substituteAll {