From f355889075209d11f10fd8d38786938dc0b1cbba Mon Sep 17 00:00:00 2001
From: Sandro Jäckel <sandro.jaeckel@gmail.com>
Date: Sun, 21 Aug 2022 17:30:18 +0200
Subject: lkl: move all patching to postPatch, simplify meta.platforms, cleanup

---
 pkgs/applications/virtualization/lkl/default.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'pkgs/applications/virtualization/lkl')

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index f2481e25a8fdb..3bb12836a032d 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -4,25 +4,27 @@
 stdenv.mkDerivation rec {
   pname = "lkl";
   version = "2019-10-04";
-  rev  = "06ca3ddb74dc5b84fa54fa1746737f2df502e047";
 
   outputs = [ "dev" "lib" "out" ];
 
-  nativeBuildInputs = [ bc bison flex python3 ];
-
-  buildInputs = [ fuse libarchive ];
-
   src = fetchFromGitHub {
-    inherit rev;
     owner  = "lkl";
     repo   = "linux";
+    rev  = "06ca3ddb74dc5b84fa54fa1746737f2df502e047";
     sha256 = "0qjp0r338bwgrqdsvy5mkdh7ryas23m47yvxfwdknfyl0k3ylq62";
   };
 
-  # Fix a /usr/bin/env reference in here that breaks sandboxed builds
-  prePatch = "patchShebangs arch/lkl/scripts";
-  # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484
-  postPatch = "sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c";
+  nativeBuildInputs = [ bc bison flex python3 ];
+
+  buildInputs = [ fuse libarchive ];
+
+  postPatch = ''
+    # Fix a /usr/bin/env reference in here that breaks sandboxed builds
+    patchShebangs arch/lkl/scripts
+
+    # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484
+    sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c
+  '';
 
   installPhase = ''
     mkdir -p $out/bin $lib/lib $dev
@@ -61,7 +63,7 @@ stdenv.mkDerivation rec {
       overhead
     '';
     homepage    = "https://github.com/lkl/linux/";
-    platforms   = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; # Darwin probably works too but I haven't tested it
+    platforms   = platforms.linux; # Darwin probably works too but I haven't tested it
     license     = licenses.gpl2;
     maintainers = with maintainers; [ copumpkin ];
   };
-- 
cgit 1.4.1