pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #121060 from veprbl/pr/gtk_remove_cups_assert

gtk*: remove assert cupsSupport -> cups != null

authored by

Dmitry Kalinkin and committed by
GitHub 2149ad5b c1faa7a2

+3 -10
unified split
+1 -4
pkgs/development/libraries/gtk/2.x.nix
··· 1 1 { config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg 2 2 , gdk-pixbuf, xlibsWrapper, gobject-introspection 3 3 , xineramaSupport ? stdenv.isLinux 4 - , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null 4 + , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups 5 5 , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" 6 6 , AppKit, Cocoa 7 7 , fetchpatch 8 8 }: 9 - 10 - assert xineramaSupport -> xorg.libXinerama != null; 11 - assert cupsSupport -> cups != null; 12 9 13 10 with lib; 14 11
+1 -3
pkgs/development/libraries/gtk/3.x.nix
··· 42 42 , xineramaSupport ? stdenv.isLinux 43 43 , cupsSupport ? stdenv.isLinux 44 44 , withGtkDoc ? stdenv.isLinux 45 - , cups ? null 45 + , cups 46 46 , AppKit 47 47 , Cocoa 48 48 , broadwaySupport ? true 49 49 }: 50 - 51 - assert cupsSupport -> cups != null; 52 50 53 51 let 54 52
+1 -3
pkgs/development/libraries/gtk/4.x.nix
··· 46 46 , xineramaSupport ? stdenv.isLinux 47 47 , cupsSupport ? stdenv.isLinux 48 48 , withGtkDoc ? stdenv.isLinux 49 - , cups ? null 49 + , cups 50 50 , AppKit 51 51 , Cocoa 52 52 , broadwaySupport ? true 53 53 }: 54 - 55 - assert cupsSupport -> cups != null; 56 54 57 55 let 58 56