about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-05-24 19:48:57 +0200
committerGitHub <noreply@github.com>2020-05-24 19:48:57 +0200
commitdc351baa440ae568dbc910b7fa1124988ea36ab3 (patch)
tree1f6eb3a96a01422d916c28357b10def20ea5ce69 /pkgs/applications
parent73b4ea16f7e3172fdc1638ec3328d3536f4d8ac0 (diff)
parent3eb91ffa68ac0766fa7cdff20ca3647024d8ab2f (diff)
Merge pull request #88570 from JJJollyjim/qboot-2020
qboot: 20170330 -> 20200423
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/virtualization/qboot/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix
index d770308239f82..800d601c76e64 100644
--- a/pkgs/applications/virtualization/qboot/default.nix
+++ b/pkgs/applications/virtualization/qboot/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, meson, ninja, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "qboot-20170330";
+  name = "qboot-20200423";
 
   src = fetchFromGitHub {
     owner = "bonzini";
     repo = "qboot";
-    rev = "ac9488f26528394856b94bda0797f5bd9c69a26a";
-    sha256 = "0l83nbjndin1cbcimkqkiqr5df8d76cnhyk26rd3aygb2bf7cspy";
+    rev = "de50b5931c08f5fba7039ddccfb249a5b3b0b18d";
+    sha256 = "1d0h29zz535m0pq18k3aya93q7lqm2858mlcp8mlfkbq54n8c5d8";
   };
 
+  nativeBuildInputs = [ meson ninja ];
+
   installPhase = ''
     mkdir -p $out
-    cp bios.bin* $out/.
+    cp bios.bin bios.bin.elf $out/.
   '';
 
   hardeningDisable = [ "stackprotector" "pic" ];