treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
This commit is contained in:
@@ -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
|
||||
];
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user