diff options
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/openvswitch')
-rw-r--r-- | nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix b/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix index 84f8abf73b0f..cbd1bbdf7633 100644 --- a/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which , procps, libcap_ng, openssl, python3 , perl , kernel ? null }: -with stdenv.lib; +with lib; let _kernel = kernel; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper util-linux openssl libcap_ng pythonEnv perl procps which ]; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = false; # bash-completion test fails with "compgen: command not found" - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; description = "A multilayer virtual switch"; longDescription = diff --git a/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix b/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix index 54ecefc54b2f..ddb5eff97230 100644 --- a/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which , procps, libcap_ng, openssl, python2, iproute , perl , automake, autoconf, libtool, kernel ? null }: -with stdenv.lib; +with lib; let _kernel = kernel; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ autoconf libtool automake pkgconfig ]; + nativeBuildInputs = [ autoconf libtool automake pkg-config ]; buildInputs = [ makeWrapper util-linux openssl libcap_ng python2 perl procps which ]; @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { --replace "self.cert_dir" "root_prefix + self.cert_dir" ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; description = "A multilayer virtual switch"; longDescription = |