diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-04-28 13:29:26 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-04-30 11:40:00 -0400 |
| commit | 04e9977b41b789949761c1d4a9656f5cf6f3838b (patch) | |
| tree | 4152424cded20d74cbf15619b8d89fadf1be64b2 /pkgs/development/libraries/gtk | |
| parent | afd7f222bf602de2f73479a9becba8761edff4be (diff) | |
| download | nixpkgs-04e9977b41b789949761c1d4a9656f5cf6f3838b.tar nixpkgs-04e9977b41b789949761c1d4a9656f5cf6f3838b.tar.gz nixpkgs-04e9977b41b789949761c1d4a9656f5cf6f3838b.tar.bz2 nixpkgs-04e9977b41b789949761c1d4a9656f5cf6f3838b.tar.lz nixpkgs-04e9977b41b789949761c1d4a9656f5cf6f3838b.tar.xz nixpkgs-04e9977b41b789949761c1d4a9656f5cf6f3838b.tar.zst nixpkgs-04e9977b41b789949761c1d4a9656f5cf6f3838b.zip | |
gtk*: remove assert cupsSupport -> cups != null
Diffstat (limited to 'pkgs/development/libraries/gtk')
| -rw-r--r-- | pkgs/development/libraries/gtk/2.x.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix | 4 | ||||
| -rw-r--r-- | 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 8f50c922f51..ea112b3d33c 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 0d4bec5f344..9f7d3050524 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 b64b8bc36fd..50b322c9dba 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 { |