treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

2021-01-01 11:52:33 +07:00
parent 54ab07c1fe
commit b04fc593e7
212 changed files with 611 additions and 634 deletions
@@ -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" ];