diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:32:19 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:32:19 +0000 |
| commit | 7562d78023ebcfd72eb4797c716e1308eb835935 (patch) | |
| tree | 8d00d1f66a49b7716ee1b23c5eab45d47bdf4c95 /pkgs | |
| parent | d9db71d5818bac04de69f12cea714d1c96776cf4 (diff) | |
| download | nixpkgs-7562d78023ebcfd72eb4797c716e1308eb835935.tar nixpkgs-7562d78023ebcfd72eb4797c716e1308eb835935.tar.gz nixpkgs-7562d78023ebcfd72eb4797c716e1308eb835935.tar.bz2 nixpkgs-7562d78023ebcfd72eb4797c716e1308eb835935.tar.lz nixpkgs-7562d78023ebcfd72eb4797c716e1308eb835935.tar.xz nixpkgs-7562d78023ebcfd72eb4797c716e1308eb835935.tar.zst nixpkgs-7562d78023ebcfd72eb4797c716e1308eb835935.zip | |
gtk2: move defaults to package file
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gtk+/2.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index c7638ea5fe5..8dad69eb998 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg +{ config, stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg , gdk_pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux -, cupsSupport ? true, cups ? null +, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57b3dcc7f6e..3486dec77e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10144,7 +10144,6 @@ in elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { - cupsSupport = config.gtk2.cups or stdenv.isLinux; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; |