treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

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
@@ -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";
'';
}