diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2020-12-31 14:48:55 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-01 11:52:33 +0700 |
commit | b04fc593e7b55fe1f74421b11589f12a339c92e2 (patch) | |
tree | fa9bbaeb68f1e0cfa6ea2f9580ea2892eed41b3e /pkgs/os-specific/linux | |
parent | 54ab07c1fe4e39c5a84834f85300c63e3809ac2d (diff) | |
download | nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.gz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.bz2 nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.lz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.xz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.zst nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.zip |
treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/anbox/default.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libwebcam/default.nix | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 5f8ca7ac46f..f7182f24f81 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl -, cmake, pkgconfig, dbus, makeWrapper +, cmake, pkg-config, dbus, makeWrapper , gtest , boost , libcap @@ -55,11 +55,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + cmake + pkg-config makeWrapper ]; buildInputs = [ - cmake pkgconfig dbus boost libcap gtest systemd mesa glib + dbus boost libcap gtest systemd mesa glib SDL2 SDL2_image protobuf protobufc properties-cpp lxc python libGL ]; diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/os-specific/linux/libwebcam/default.nix index 5cccc82b843..5f87a89496b 100644 --- a/pkgs/os-specific/linux/libwebcam/default.nix +++ b/pkgs/os-specific/linux/libwebcam/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , cmake -, pkgconfig +, pkg-config , libxml2 }: @@ -19,11 +19,8 @@ stdenv.mkDerivation rec { ./uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch ]; - buildInputs = [ - cmake - pkgconfig - libxml2 - ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libxml2 ]; postPatch = '' substituteInPlace ./uvcdynctrl/CMakeLists.txt \ |