public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: explicitly specify gtk and related package versions

Browse Source
This commit is contained in:
Kirill Boltaev
2016-09-12 00:24:51 +03:00
parent 30107249b1
commit bccd75094f
339 changed files with 893 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
View File

@@ -1,5 +1,5 @@
{ clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchsvn, gyp, which, ninja,
python, pkgconfig, protobuf, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese,
python, pkgconfig, protobuf, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese,
fcitx, gettext }:
let
japanese_usage_dictionary = fetchsvn {
@@ -23,7 +23,7 @@ in clangStdenv.mkDerivation rec {
};
nativeBuildInputs = [ gyp which ninja python pkgconfig ];
buildInputs = [ protobuf gtk zinnia qt4 libxcb fcitx gettext ];
buildInputs = [ protobuf gtk2 zinnia qt4 libxcb fcitx gettext ];
postUnpack = ''
rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/

4
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
View File

@@ -1,4 +1,4 @@
{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese }:
{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }:
let
japanese_usage_dictionary = fetchsvn {
@@ -20,7 +20,7 @@ in clangStdenv.mkDerivation rec {
};
nativeBuildInputs = [ gyp which ninja python pkgconfig ];
buildInputs = [ protobuf ibus gtk zinnia qt4 libxcb ];
buildInputs = [ protobuf ibus gtk2 zinnia qt4 libxcb ];
src = fetchFromGitHub {
owner = "google";

4
pkgs/tools/inputmethods/nabi/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, libhangul }:
{ stdenv, fetchurl, pkgconfig, gtk2, libhangul }:
stdenv.mkDerivation {
name = "nabi-1.0.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw";
};
buildInputs = [ gtk libhangul pkgconfig ];
buildInputs = [ gtk2 libhangul pkgconfig ];
meta = with stdenv.lib; {
description = "The Easy Hangul XIM";