mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
treewide: Make explicit that 'dev' output of libnl is used
This commit is contained in:
parent
be00816cab
commit
603dcd6263
@ -71,7 +71,7 @@ in stdenv.mkDerivation rec {
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
|
||||
substituteInPlace configure.ac \
|
||||
--replace /usr/include/libnl3 ${libnl}/include/libnl3
|
||||
--replace /usr/include/libnl3 ${libnl.dev}/include/libnl3
|
||||
|
||||
substituteInPlace src/linux/perf.cpp \
|
||||
--replace '"perf ' '"${perf}/bin/perf '
|
||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
|
||||
substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""
|
||||
substituteInPlace ./Documentation/Makefile --replace "--skip-validation" "--skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
|
||||
substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl}/include/libnl3"
|
||||
substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3"
|
||||
substituteInPlace ./Makefile --replace "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" ""
|
||||
ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
|
||||
'';
|
||||
|
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
||||
cat -n .config
|
||||
substituteInPlace Makefile --replace /usr/local $out
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \
|
||||
-I$(echo "${libnl}"/include/libnl*/) \
|
||||
-I$(echo "${libnl.dev}"/include/libnl*/) \
|
||||
-I${pcsclite}/include/PCSC/"
|
||||
'';
|
||||
|
||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
# It doesn't know about the include/libnl<n> directory
|
||||
NIX_CFLAGS_COMPILE="-I${libnl}/include/libnl3";
|
||||
NIX_CFLAGS_COMPILE="-I${libnl.dev}/include/libnl3";
|
||||
NIX_LDFLAGS="-lnl-3 -lnl-genl-3";
|
||||
|
||||
configureFlags = [
|
||||
|
Loading…
Reference in New Issue
Block a user