ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

treewide: Make explicit that 'dev' output of libnl is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:37:26 +03:00 committed by Vladimír Čunát
parent be00816cab
commit 603dcd6263
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/cluster/mesos/default.nix
View File

@ -71,7 +71,7 @@ in stdenv.mkDerivation rec {
'' + lib.optionalString stdenv.isLinux '' '' + lib.optionalString stdenv.isLinux ''
substituteInPlace configure.ac \ substituteInPlace configure.ac \
--replace /usr/include/libnl3 ${libnl}/include/libnl3 --replace /usr/include/libnl3 ${libnl.dev}/include/libnl3
substituteInPlace src/linux/perf.cpp \ substituteInPlace src/linux/perf.cpp \
--replace '"perf ' '"${perf}/bin/perf ' --replace '"perf ' '"${perf}/bin/perf '

2
pkgs/os-specific/linux/criu/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" 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 ./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" "" 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 ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
''; '';

2
pkgs/os-specific/linux/wpa_supplicant/default.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
cat -n .config cat -n .config
substituteInPlace Makefile --replace /usr/local $out substituteInPlace Makefile --replace /usr/local $out
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \
-I$(echo "${libnl}"/include/libnl*/) \ -I$(echo "${libnl.dev}"/include/libnl*/) \
-I${pcsclite}/include/PCSC/" -I${pcsclite}/include/PCSC/"
''; '';

2
pkgs/tools/networking/keepalived/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
''; '';
# It doesn't know about the include/libnl<n> directory # 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"; NIX_LDFLAGS="-lnl-3 -lnl-genl-3";
configureFlags = [ configureFlags = [