philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #121060 from veprbl/pr/gtk_remove_cups_assert 

gtk*: remove assert cupsSupport -> cups != null
master
Dmitry Kalinkin 2021-05-05 14:13:03 -04:00 committed by GitHub
parent c1faa7a24d 04e9977b41
commit 2149ad5bdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/gtk/2.x.nix
View File

@ -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

4
pkgs/development/libraries/gtk/3.x.nix
View File

@ -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 {

4
pkgs/development/libraries/gtk/4.x.nix
View File

@ -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 {