summary refs log tree commit diff
path: root/pkgs/os-specific/linux/isgx
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2021-04-21 06:03:35 +0200
committerJörg Thalheim <joerg@thalheim.io>2021-04-21 11:12:49 +0200
commit7745b7a9d1c1aea593c45d2645ebe8f27baf9f1d (patch)
treee6b8bee97eb190bc75f0673594d923aebfa88f96 /pkgs/os-specific/linux/isgx
parent8284fc30c84ea47e63209d1a892aca1dfcd6bdf3 (diff)
downloadnixpkgs-7745b7a9d1c1aea593c45d2645ebe8f27baf9f1d.tar
nixpkgs-7745b7a9d1c1aea593c45d2645ebe8f27baf9f1d.tar.gz
nixpkgs-7745b7a9d1c1aea593c45d2645ebe8f27baf9f1d.tar.bz2
nixpkgs-7745b7a9d1c1aea593c45d2645ebe8f27baf9f1d.tar.lz
nixpkgs-7745b7a9d1c1aea593c45d2645ebe8f27baf9f1d.tar.xz
nixpkgs-7745b7a9d1c1aea593c45d2645ebe8f27baf9f1d.tar.zst
nixpkgs-7745b7a9d1c1aea593c45d2645ebe8f27baf9f1d.zip
isgx: fix support for 5.11
Diffstat (limited to 'pkgs/os-specific/linux/isgx')
-rw-r--r--pkgs/os-specific/linux/isgx/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/isgx/default.nix b/pkgs/os-specific/linux/isgx/default.nix
index 1806916b14d..5963d8a0e4f 100644
--- a/pkgs/os-specific/linux/isgx/default.nix
+++ b/pkgs/os-specific/linux/isgx/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/intel/linux-sgx-driver/commit/276c5c6a064d22358542f5e0aa96b1c0ace5d695.patch";
       sha256 = "sha256-PmchqYENIbnJ51G/tkdap/g20LUrJEoQ4rDtqy6hj24=";
     })
+    # Fixes detection with kernel >= 5.11
+    (fetchpatch {
+      url = "https://github.com/intel/linux-sgx-driver/commit/ed2c256929962db1a8805db53bed09bb8f2f4de3.patch";
+      sha256 = "sha256-MRbgS4U8FTCP1J1n+rhsvbXxKDytfl6B7YlT9Izq05U=";
+    })
   ];
 
   hardeningDisable = [ "pic" ];
@@ -47,7 +52,5 @@ stdenv.mkDerivation rec {
     license = with licenses; [ bsd3 /* OR */ gpl2Only ];
     maintainers = with maintainers; [ oxalica ];
     platforms = platforms.linux;
-    # The driver is already in kernel >= 5.11.0.
-    broken = kernelAtLeast "5.11.0";
   };
 }