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

treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-01 11:52:33 +07:00
parent 54ab07c1fe
commit b04fc593e7
212 changed files with 611 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkgconfig }:
{ stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkg-config }:
stdenv.mkDerivation rec {
pname = "fcitx-anthy";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake fcitx anthy gettext ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fcitx anthy gettext ];
preInstall = ''
substituteInPlace src/cmake_install.cmake \
pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkgconfig }:
{ stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkg-config }:
stdenv.mkDerivation rec {
pname = "fcitx-chewing";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1w5smp5zvjx681cp1znjypyr9sw5x6v0wnsk8a7ncwxi9q9wf4xk";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake fcitx gettext libchewing ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fcitx gettext libchewing ];
preInstall = ''
substituteInPlace src/cmake_install.cmake \
pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, curl }:
{ stdenv, fetchurl, cmake, pkg-config, fcitx, gettext, curl }:
stdenv.mkDerivation rec {
pname = "fcitx-cloudpinyin";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0ai347wv3qdjzcbh0j9hdjpzwvh2kk57324xbxq37nzagrdgg5x0";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake fcitx gettext curl ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fcitx gettext curl ];
preInstall = ''
substituteInPlace src/cmake_install.cmake \
pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkgconfig }:
{ stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkg-config }:
stdenv.mkDerivation rec {
pname = "fcitx-hangul";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0ds4071ljq620w7vnprm2jl8zqqkw7qsxvzbjapqak4jarczvmbd";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake fcitx libhangul gettext ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fcitx libhangul gettext ];
preInstall = ''
substituteInPlace src/cmake_install.cmake \
pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }:
{ stdenv, fetchurl, cmake, pkg-config, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }:
stdenv.mkDerivation rec {
pname = "fcitx-libpinyin";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev cmake fcitx gettext libpinyin glib pcre dbus ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev fcitx gettext libpinyin glib pcre dbus ];
# With a typical installation via NixOS option i18n.inputMethod.fcitx.engines,
# the FCITXDIR environment variable is set to $out of fcitx-with-plugins,
pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkgconfig }:
{ stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkg-config }:
stdenv.mkDerivation rec {
pname = "fcitx-m17n";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "15s52h979xz967f8lm0r0qkplig2w3wjck1ymndbg9kvj25ib0ng";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake fcitx gettext m17n_lib m17n_db ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fcitx gettext m17n_lib m17n_db ];
preInstall = ''
substituteInPlace im/cmake_install.cmake \
pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }:
{ stdenv, fetchurl, cmake, pkg-config, fcitx, librime, brise, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "fcitx-rime";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr";
};
buildInputs = [ cmake pkgconfig fcitx librime brise hicolor-icon-theme ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fcitx librime brise hicolor-icon-theme ];
# cmake cannont automatically find our nonstandard brise install location
cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ];
pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
+2 -1
View File
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef";
};
buildInputs = [ cmake fcitx gettext ];
nativeBuildInputs = [ cmake ];
buildInputs = [ fcitx gettext ];
preInstall = ''
substituteInPlace tables/cmake_install.cmake \
pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
+2 -1
View File
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1di60lr6l5k2sdwi3yrc0hl89j2k0yipayrsn803vd040w1fgfhq";
};
buildInputs = [ cmake fcitx gettext ];
nativeBuildInputs = [ cmake ];
buildInputs = [ fcitx gettext ];
preInstall = ''
substituteInPlace tables/cmake_install.cmake \
pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, gettext, pkgconfig }:
{ stdenv, fetchurl, cmake, fcitx, gettext, pkg-config }:
stdenv.mkDerivation rec {
pname = "fcitx-unikey";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake fcitx gettext ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fcitx gettext ];
NIX_CFLAGS_COMPILE = "-Wno-narrowing";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
substituteInPlace data/cmake_install.cmake \
--replace ${fcitx} $out
'';
meta = with stdenv.lib; {
isFcitxEngine = true;
homepage = "https://github.com/fcitx/fcitx-unikey";
pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
+3 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, cmake, fcitx, gtk3, isocodes, gnome3 }:
{ stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }:
stdenv.mkDerivation rec {
name = "fcitx-configtool-0.4.10";
@@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper fcitx cmake isocodes gtk3
gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [ fcitx isocodes gtk3 gnome3.adwaita-icon-theme ];
# Patch paths to `fcitx-remote`
prePatch = ''
@@ -32,4 +31,3 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS";
'';
}
pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, fetchFromGitHub, pkgconfig, ibus, ibus-table, python3, cmake }:
{ stdenv, fetchgit, fetchFromGitHub, pkg-config, ibus, ibus-table, python3, cmake }:
let
src = fetchFromGitHub {
@@ -51,7 +51,8 @@ in stdenv.mkDerivation {
rm -rf $HOME
'';
buildInputs = [ pkgconfig ibus ibus-table python3 cmake ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ibus ibus-table python3 ];
meta = with stdenv.lib; {
isIbusEngine = true;
pkgs/tools/inputmethods/ibus/ibus-qt.nix
+3 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }:
{ stdenv, fetchurl, ibus, cmake, pkg-config, qt4, icu, doxygen }:
stdenv.mkDerivation rec {
pname = "ibus-qt";
@@ -9,10 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
ibus cmake qt4 icu doxygen
];
nativeBuildInputs = [ cmake pkg-config doxygen ];
buildInputs = [ ibus qt4 icu ];
cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ];