From ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 21 May 2018 01:04:31 +0000
Subject: dpdk: install files in the standard layout

---
 pkgs/os-specific/linux/dpdk/default.nix     | 2 +-
 pkgs/os-specific/linux/odp-dpdk/default.nix | 2 +-
 pkgs/os-specific/linux/pktgen/default.nix   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index 808feaff02c..78b11c7b18f 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -40,7 +40,7 @@ EOF
   installTargets = [ "install-runtime" "install-sdk" "install-kmod" ]; # skip install-doc
 
   installFlags = [
-    "prefix=$(out)" "datadir=$(out)" "includedir=$(out)/include"
+    "prefix=$(out)"
   ] ++ lib.optionals mod [
     "kerneldir=$(kmod)/lib/modules/${kver}"
   ];
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
index cf4f9df2677..ff408b6a624 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ dpdk libconfig libpcap numactl openssl ];
 
-  RTE_SDK = dpdk;
+  RTE_SDK = "${dpdk}/share/dpdk";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
   dontDisableStatic = true;
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index c443da7df3b..a7bb4a81510 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
     [ dpdk libpcap numactl ]
     ++ stdenv.lib.optionals withGtk [gtk2];
 
-  RTE_SDK = "${dpdk}";
+  RTE_SDK = "${dpdk}/share/dpdk";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
   GUI = stdenv.lib.optionalString withGtk "true";
 
-- 
cgit 1.4.1