treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
This commit is contained in:
@@ -5,9 +5,8 @@
|
||||
with stdenv;
|
||||
|
||||
{
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which catch2 ];
|
||||
nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ];
|
||||
buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos boost libcxx catch2 ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}"
|
||||
|
||||
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
|
||||
./prevent-kill-on-shutdown.patch
|
||||
];
|
||||
|
||||
buildInputs = [ cmake fuse ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ fuse ];
|
||||
|
||||
# Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it
|
||||
# possible to do:
|
||||
|
||||
Reference in New Issue
Block a user