From 3d84b6f5ea83a235fe391aebdbe6e33163e13a4e Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Wed, 9 Jan 2019 16:42:17 +0000 Subject: [PATCH] openvswitch: fix cross-compilation --- pkgs/os-specific/linux/openvswitch/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index bf26b9e2b28bd..730a93d0a3337 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -17,9 +17,8 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper utillinux openssl libcap_ng python27 - perl procps which ]; + nativeBuildInputs = [ pkgconfig openssl python27 perl which ]; + buildInputs = [ makeWrapper utillinux openssl libcap_ng python27 procps ]; configureFlags = [ "--localstatedir=/var" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21f5f14a2dcb7..312bc9a85e349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5298,7 +5298,7 @@ in opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; openvswitch = callPackage ../os-specific/linux/openvswitch { - openssl = openssl_1_0_2; + openssl = __splicedPackages.openssl_1_0_2; }; optipng = callPackage ../tools/graphics/optipng {