diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:37:26 +0300 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:43 +0200 |
commit | 603dcd6263effbae1342486c3defbc1737c6ed9a (patch) | |
tree | aeea476f68269b801977e728f02ff0b6b902aa2d /pkgs | |
parent | be00816cabc1fa91069c1d0c25ff2f94acaf3b27 (diff) |
treewide: Make explicit that 'dev' output of libnl is used
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/cluster/mesos/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/criu/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/keepalived/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 6d6040aba8ba3..bafa63b6fdcda 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -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 ' diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 0d06864df1e50..630c498532580 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -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 ''; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 0edd2d6e0f45d..a3e9e930f5ea2 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -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/" ''; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index bc0085a731eb6..1d0c9d55076e5 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -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 = [ |