Unverified Commit e1217716 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

linuxPackages.dpdk-kmods: move env variables into env for structuredAttrs (#502561)

parents 5fac3c5d 15b92cdc

pkgs/os-specific/linux/dpdk-kmods/default.nix

+6 −5
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 
  kernelModuleMakeFlags,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "dpdk-kmods";

  version = "2023-02-05";



  src = fetchzip {

    url = "https://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-e721c733cd24206399bebb8f0751b0387c4c1595.tar.xz";

    sha256 = "sha256-AG5Lthp+CPR4R7I23DUmoWAmET8gLEFHHdjk2TUbQn4=";

    hash = "sha256-AG5Lthp+CPR4R7I23DUmoWAmET8gLEFHHdjk2TUbQn4=";

  };



  hardeningDisable = [ "pic" ];
@@ -20,14 +20,15 @@ stdenv.mkDerivation rec { 
  makeFlags = kernelModuleMakeFlags ++ [

    "INSTALL_MOD_PATH=${placeholder "out"}"

  ];

  KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";



  env.KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";



  nativeBuildInputs = kernel.moduleBuildDependencies;



  preBuild = "cd linux/igb_uio";



  installPhase = ''

    make -C ${KSRC} M=$(pwd) modules_install $makeFlags

    make -C ${finalAttrs.env.KSRC} M=$(pwd) modules_install $makeFlags

  '';



  enableParallelBuilding = true;
@@ -39,4 +40,4 @@ stdenv.mkDerivation rec { 
    maintainers = [ lib.maintainers.mic92 ];

    platforms = lib.platforms.linux;

  };

}
 
})