diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-12-15 22:31:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 22:31:33 -0500 |
| commit | 08d6cec730e825d240ddf1df12808f502caf3b87 (patch) | |
| tree | 5cb45c650214b3c847c501cabc39e150619dafb8 | |
| parent | baa02207279115f5457c18fef3fc3513f58fa8d2 (diff) | |
| parent | c048cfe481a0d93ce6742346fe4a6db1588b05cc (diff) | |
| download | nixlib-08d6cec730e825d240ddf1df12808f502caf3b87.tar nixlib-08d6cec730e825d240ddf1df12808f502caf3b87.tar.gz nixlib-08d6cec730e825d240ddf1df12808f502caf3b87.tar.bz2 nixlib-08d6cec730e825d240ddf1df12808f502caf3b87.tar.lz nixlib-08d6cec730e825d240ddf1df12808f502caf3b87.tar.xz nixlib-08d6cec730e825d240ddf1df12808f502caf3b87.tar.zst nixlib-08d6cec730e825d240ddf1df12808f502caf3b87.zip | |
Merge pull request #232136 from kylehendricks/add-gasket-linux-kernels
gasket: moved to linux-kernels.nix
| -rw-r--r-- | pkgs/os-specific/linux/gasket/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index b9aebacca641..c1e81dfa9b71 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "fcnqCBh04e+w8g079JyuyY2RPu34M+/X+Q8ObE+42i4="; }; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(PWD)" @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ lib.maintainers.kylehendricks ]; platforms = platforms.linux; + broken = versionOlder kernel.version "5.15"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 538485059581..3519439bcdc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27843,10 +27843,6 @@ with pkgs; fwts = callPackage ../os-specific/linux/fwts { }; - gasket = callPackage ../os-specific/linux/gasket { - inherit (linuxPackages) kernel; - }; - gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 64e0dee47514..41177f9d039b 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -348,6 +348,8 @@ in { fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; + gasket = callPackage ../os-specific/linux/gasket { }; + gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; |