Unverified Commit d8fb4f0b authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

pkgsLLVM.linuxPackages: kernel module fixes (#440075)

parents 0a6d7847 df4ee604

pkgs/by-name/li/libdrm/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
  libpthreadstubs,

  withIntel ? lib.meta.availableOn stdenv.hostPlatform libpciaccess,

  libpciaccess,

  withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light,

  withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !stdenv.cc.isClang,

  valgrind-light,

  gitUpdater,

}:

pkgs/os-specific/linux/ch9344/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  lib,

  fetchFromGitHub,

  kernel,

  kernelModuleMakeFlags,

}:



stdenv.mkDerivation rec {
@@ -30,7 +31,7 @@ stdenv.mkDerivation rec { 
    substituteInPlace Makefile --replace "KERNELDIR :=" "KERNELDIR ?="

  '';



  makeFlags = [

  makeFlags = kernelModuleMakeFlags ++ [

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

  ];

pkgs/os-specific/linux/nvidia-x11/generic.nix

+3 −0
Original line number Diff line number Diff line
@@ -215,6 +215,9 @@ stdenv.mkDerivation (finalAttrs: { 
      "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"

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

    ]

    ++ lib.optionals stdenv.cc.isClang [

      "C_INCLUDE_PATH=${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"

    ]

  );



  hardeningDisable = [

pkgs/os-specific/linux/nvidia-x11/open.nix

+13 −12
Original line number Diff line number Diff line
@@ -26,17 +26,18 @@ stdenv.mkDerivation ( 


    nativeBuildInputs = kernel.moduleBuildDependencies;



    makeFlags = kernelModuleMakeFlags ++ [

    makeFlags =

      kernelModuleMakeFlags

      ++ [

        "IGNORE_PREEMPT_RT_PRESENCE=1"

        "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"

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

        "MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"

        "DATE="

      {

        aarch64-linux = "TARGET_ARCH=aarch64";

        x86_64-linux = "TARGET_ARCH=x86_64";

      }

      .${stdenv.hostPlatform.system}

        "TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"

      ]

      ++ lib.optionals stdenv.cc.isClang [

        "C_INCLUDE_PATH=${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"

      ];



    installTargets = [ "modules_install" ];