diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-05-21 01:04:31 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-05-21 01:19:31 +0000 |
| commit | ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d (patch) | |
| tree | 506bc56eb8912cf98fbe3bf799508144d658fa93 /pkgs/os-specific | |
| parent | 345f4639d66a0c7f4163bf4f5123d00889a5e3eb (diff) | |
| download | nixpkgs-ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d.tar nixpkgs-ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d.tar.gz nixpkgs-ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d.tar.bz2 nixpkgs-ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d.tar.lz nixpkgs-ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d.tar.xz nixpkgs-ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d.tar.zst nixpkgs-ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d.zip | |
dpdk: install files in the standard layout
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/dpdk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/odp-dpdk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pktgen/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
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"; |