alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

treewide: explicitly specify gtk version

Browse source
This commit is contained in:
Kirill Boltaev 2016-09-13 20:42:55 +03:00
parent 4b55b0358a
commit 0f37287df5
19 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/audio/aumix/default.nix
View file

@ -1,9 +1,9 @@
{stdenv, fetchurl, gettext, ncurses
, gtkGUI ? false
, pkgconfig ? null
, gtk ? null}:
, gtk2 ? null}:
assert gtkGUI -> pkgconfig != null && gtk != null;
assert gtkGUI -> pkgconfig != null && gtk2 != null;
stdenv.mkDerivation rec {
name = "aumix-2.9.1";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ gettext ncurses ]
++ (if gtkGUI then [pkgconfig gtk] else []);
++ (if gtkGUI then [pkgconfig gtk2] else []);
meta = {
description = "Audio mixer for X and the console";

4
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -5,7 +5,7 @@
, enableSELinux ? false
, enableNaCl ? false
, enableHotwording ? false
, gnomeSupport ? false
, gnomeSupport ? false, gnome ? null
, gnomeKeyringSupport ? false
, proprietaryCodecs ? true
, enablePepperFlash ? false
@ -22,7 +22,7 @@ let
upstream-info = (callPackage ./update.nix {}).getChannel channel;
mkChromiumDerivation = callPackage ./common.nix {
inherit enableSELinux enableNaCl enableHotwording gnomeSupport
inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome
gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
hiDPISupport;
};

6
pkgs/applications/networking/sniffers/wireshark/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
, gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
, zlib
, withGtk ? false, gtk ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
, withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
, withQt ? false, qt4 ? null
}:
assert withGtk -> !withQt && gtk != null;
assert withGtk -> !withQt && gtk2 != null;
assert withQt -> !withGtk && qt4 != null;
with stdenv.lib;
@ -27,7 +27,7 @@ stdenv.mkDerivation {
bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls
geoip libnl c-ares python libcap glib zlib
] ++ optional withQt qt4
++ (optionals withGtk [gtk pango cairo gdk_pixbuf]);
++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]);
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];

6
pkgs/desktops/gnome-2/platform/GConf/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2
, polkit, intltool, dbus_libs, gtk ? null, withGtk ? false }:
, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }:
assert withGtk -> (gtk != null);
assert withGtk -> (gtk2 != null);
stdenv.mkDerivation {
name = "gconf-2.32.4";
@ -17,7 +17,7 @@ stdenv.mkDerivation {
# polkit requires pam, which requires shadow.h, which is not available on
# darwin
++ stdenv.lib.optional (!stdenv.isDarwin) polkit
++ stdenv.lib.optional withGtk gtk;
++ stdenv.lib.optional withGtk gtk2;
propagatedBuildInputs = [ glib ];

8
pkgs/development/compilers/gcc/4.5/default.nix
View file

@ -12,7 +12,7 @@
, libelf # optional, for link-time optimizations (LTO)
, ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
, zip ? null, unzip ? null, pkgconfig ? null, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
@ -62,7 +62,7 @@ let version = "4.5.4";
xproto renderproto xextproto inputproto randrproto
];
javaAwtGtk = langJava && gtk != null;
javaAwtGtk = langJava && gtk2 != null;
/* Cross-gcc settings */
gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross;
@ -122,7 +122,7 @@ let version = "4.5.4";
in
# We need all these X libraries when building AWT with GTK+.
assert gtk != null -> (filter (x: x == null) xlibs) == [];
assert gtk2 != null -> (filter (x: x == null) xlibs) == [];
stdenv.mkDerivation ({
name = "${name}-${version}" + crossNameAddon;
@ -223,7 +223,7 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optional langJava boehmgc)
++ (optionals langJava [zip unzip])
++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs))
++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])

8
pkgs/development/compilers/gcc/4.6/default.nix
View file

@ -13,7 +13,7 @@
, libelf # optional, for link-time optimizations (LTO)
, ppl ? null, cloog ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
, zip ? null, unzip ? null, pkgconfig ? null, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
@ -82,7 +82,7 @@ let version = "4.6.4";
xproto renderproto xextproto inputproto randrproto
];
javaAwtGtk = langJava && gtk != null;
javaAwtGtk = langJava && gtk2 != null;
/* Platform flags */
platformFlags = let
@ -175,7 +175,7 @@ let version = "4.6.4";
in
# We need all these X libraries when building AWT with GTK+.
assert gtk != null -> (filter (x: x == null) xlibs) == [];
assert gtk2 != null -> (filter (x: x == null) xlibs) == [];
stdenv.mkDerivation ({
name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
@ -266,7 +266,7 @@ stdenv.mkDerivation ({
++ (optional (cloog != null) cloog)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])

6
pkgs/development/compilers/gcc/4.8/default.nix
View file

@ -16,7 +16,7 @@
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null
, gtk ? null, libart_lgpl ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
@ -203,7 +203,7 @@ let version = "4.8.5";
in
# We need all these X libraries when building AWT with GTK+.
assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [];
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
@ -291,7 +291,7 @@ stdenv.mkDerivation ({
++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])

6
pkgs/development/compilers/gcc/4.9/default.nix
View file

@ -16,7 +16,7 @@
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null
, gtk ? null, libart_lgpl ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
@ -207,7 +207,7 @@ let version = "4.9.4";
in
# We need all these X libraries when building AWT with GTK+.
assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [];
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
@ -296,7 +296,7 @@ stdenv.mkDerivation ({
++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])

6
pkgs/development/compilers/gcc/5/default.nix
View file

@ -16,7 +16,7 @@
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null
, gtk ? null, libart_lgpl ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
@ -207,7 +207,7 @@ let version = "5.4.0";
in
# We need all these X libraries when building AWT with GTK+.
assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [];
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
@ -295,7 +295,7 @@ stdenv.mkDerivation ({
++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])

6
pkgs/development/compilers/gcc/6/default.nix
View file

@ -16,7 +16,7 @@
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null
, gtk ? null, libart_lgpl ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
@ -206,7 +206,7 @@ let version = "6.2.0";
in
# We need all these X libraries when building AWT with GTK+.
assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [];
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
@ -293,7 +293,7 @@ stdenv.mkDerivation ({
++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])

4
pkgs/development/libraries/libappindicator/default.nix
View file

@ -6,7 +6,7 @@
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
, python, pygobject2, pygtk, gobjectIntrospection, vala_0_23
, monoSupport ? false, mono ? null, gtk-sharp ? null
, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
}:
with lib;
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
glib dbus_glib
python pygobject2 pygtk gobjectIntrospection vala_0_23
] ++ (if gtkVersion == "2"
then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ]
then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]);
postPatch = ''

4
pkgs/development/libraries/libinfinity/default.nix
View file

@ -3,7 +3,7 @@
, documentation ? false # build documentation
, avahiSupport ? false # build support for Avahi in libinfinity
, stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl
, gtk ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }:
, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }:
let
edf = flag: feature: (if flag then "--with-" else "--without-") + feature;
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ]
++ optional gtkWidgets gtk
++ optional gtkWidgets gtk2
++ optional documentation gtkdoc
++ optional avahiSupport avahi
++ optional daemon libdaemon;

6
pkgs/development/tools/analysis/radare/default.nix
View file

@ -1,10 +1,10 @@
{stdenv, fetchurl, pkgconfig, libusb, readline, lua, libewf, perl,
gtk ? null, vte ? null, gtkdialog ? null,
gtk2 ? null, vte ? null, gtkdialog ? null,
python ? null,
ruby ? null,
useX11, rubyBindings, pythonBindings, luaBindings}:
assert useX11 -> (gtk != null && vte != null && gtkdialog != null);
assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
assert rubyBindings -> ruby != null;
assert pythonBindings -> python != null;
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs = [pkgconfig readline libusb perl]
++ optional useX11 [gtkdialog vte gtk]
++ optional useX11 [gtkdialog vte gtk2]
++ optional rubyBindings [ruby]
++ optional pythonBindings [python]
++ optional luaBindings [lua];

6
pkgs/development/tools/analysis/radare2/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl,
gtk ? null, vte ? null, gtkdialog ? null,
gtk2 ? null, vte ? null, gtkdialog ? null,
python ? null,
ruby ? null,
lua ? null,
useX11, rubyBindings, pythonBindings, luaBindings}:
assert useX11 -> (gtk != null && vte != null && gtkdialog != null);
assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
assert rubyBindings -> ruby != null;
assert pythonBindings -> python != null;
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [pkgconfig readline libusb libewf perl zlib openssl]
++ optional useX11 [gtkdialog vte gtk]
++ optional useX11 [gtkdialog vte gtk2]
++ optional rubyBindings [ruby]
++ optional pythonBindings [python]
++ optional luaBindings [lua];

6
pkgs/os-specific/linux/kernel/perf.nix
View file

@ -1,11 +1,11 @@
{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils
, libiberty
, zlib, withGtk ? false, gtk ? null }:
, zlib, withGtk ? false, gtk2 ? null }:
with lib;
assert withGtk -> gtk != null;
assert withGtk -> gtk2 != null;
assert versionAtLeast kernel.version "3.12";
stdenv.mkDerivation {
@ -26,7 +26,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
flex bison libiberty ];
buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++
stdenv.lib.optional withGtk gtk;
stdenv.lib.optional withGtk gtk2;
# Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff.

6
pkgs/tools/networking/mtr/default.nix
View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, ncurses, autoconf
, withGtk ? false, gtk ? null}:
, withGtk ? false, gtk2 ? null}:
assert withGtk -> gtk != null;
assert withGtk -> gtk2 != null;
with stdenv.lib;
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
configureFlags = optionalString (!withGtk) "--without-gtk";
buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk;
buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk2;
meta = {
homepage = http://www.bitwizard.nl/mtr/;

4
pkgs/tools/security/nmap/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, libpcap, pkgconfig, openssl
, graphicalSupport ? false
, libX11 ? null
, gtk ? null
, gtk2 ? null
, pythonPackages
, makeWrapper ? null
}:
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ libpcap pkgconfig openssl makeWrapper python ]
++ optionals graphicalSupport [
libX11 gtk pygtk pysqlite pygobject2 pycairo
libX11 gtk2 pygtk pysqlite pygobject2 pycairo
];
meta = {

4
pkgs/tools/system/lshw/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl
, withGUI? false, gtk? null, pkgconfig? null, sqlite? null # compile GUI
, withGUI ? false, gtk2 ? null, pkgconfig? null, sqlite ? null # compile GUI
}:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1728b96gyjmrp31knzips9azn6wkfdp5k5dnbil7h7hgz99w177b";
};
buildInputs = [] ++ stdenv.lib.optional withGUI [ gtk pkgconfig sqlite ];
buildInputs = [] ++ stdenv.lib.optional withGUI [ gtk2 pkgconfig sqlite ];
postBuild = if withGUI then "make gui" else "";

2
pkgs/top-level/all-packages.nix
View file

@ -4668,7 +4668,6 @@ in
langC = false;
profiledCompiler = false;
inherit zip unzip zlib boehmgc gettext pkgconfig perl;
gtk = gtk2;
inherit (gnome2) libart_lgpl;
});
@ -12621,6 +12620,7 @@ in
enablePepperFlash = config.chromium.enablePepperFlash or false;
enableWideVine = config.chromium.enableWideVine or false;
hiDPISupport = config.chromium.hiDPISupport or false;
gnome = gnome2;
};
chronos = callPackage ../applications/networking/cluster/chronos { };