git.iko.soy/typeable/nixpkgs
on master help sign in
gtk*: remove assert cupsSupport -> cups != null
commit04e9977b41b789949761c1d4a9656f5cf6f3838b authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateWed 28 Apr 2021, 13:29 (6 years ago) parentafd7f22
3 files changed+3−10
compare with master
unifiedsplit
pkgs/development/libraries/gtk/2.x.nix+1−4 pkgs/development/libraries/gtk/3.x.nix+1−3 pkgs/development/libraries/gtk/4.x.nix+1−3
pkgs/development/libraries/gtk/2.x.nix+1−4
@@ -1,15 +1,12 @@
11{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
22, gdk-pixbuf, xlibsWrapper, gobject-introspection
33, xineramaSupport ? stdenv.isLinux
4−, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null
4+, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups
55, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
66, AppKit, Cocoa
77, fetchpatch
88}:
99
10−assert xineramaSupport -> xorg.libXinerama != null;
11−assert cupsSupport -> cups != null;
12−
1310with lib;
1411
1512let
pkgs/development/libraries/gtk/3.x.nix+1−3
@@ -42,14 +42,12 @@
4242, xineramaSupport ? stdenv.isLinux
4343, cupsSupport ? stdenv.isLinux
4444, withGtkDoc ? stdenv.isLinux
45−, cups ? null
45+, cups
4646, AppKit
4747, Cocoa
4848, broadwaySupport ? true
4949}:
5050
51−assert cupsSupport -> cups != null;
52−
5351let
5452
5553 gtkCleanImmodulesCache = substituteAll {
pkgs/development/libraries/gtk/4.x.nix+1−3
@@ -46,14 +46,12 @@
4646, xineramaSupport ? stdenv.isLinux
4747, cupsSupport ? stdenv.isLinux
4848, withGtkDoc ? stdenv.isLinux
49−, cups ? null
49+, cups
5050, AppKit
5151, Cocoa
5252, broadwaySupport ? true
5353}:
5454
55−assert cupsSupport -> cups != null;
56−
5755let
5856
5957 gtkCleanImmodulesCache = substituteAll {