From c1b86245a1b556b79b330378b88fafb827287deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 18 Apr 2022 14:45:49 +0200
Subject: [PATCH] fix for nixUnstable

---
 flake.nix            | 8 ++++++--
 src/nix-eval-jobs.cc | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3b0b7ff..8b5bc6c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,9 @@
         checks =
           let
             mkVariant = nix: (packages.nix-eval-jobs.override {
-              inherit nix;
+              # TODO: fix to stable after next nix release
+              nix = pkgs.nixUnstable;
+              #inherit nix;
             }).overrideAttrs (_: {
               name = "nix-eval-jobs-${nix.version}";
               inherit (nix) version;
@@ -44,7 +46,9 @@
               touch $out
             '';
 
-            build = mkVariant pkgs.nix;
+            # TODO fix to unstable in next release
+            build = mkVariant pkgs.nixUnstable;
+            #build = mkVariant pkgs.nix;
             build-unstable = mkVariant pkgs.nixUnstable;
           };
 
diff --git a/src/nix-eval-jobs.cc b/src/nix-eval-jobs.cc
index fd33320..50c99d5 100644
--- a/src/nix-eval-jobs.cc
+++ b/src/nix-eval-jobs.cc
@@ -217,7 +217,9 @@ static void worker(
                 reply["system"] = drv->querySystem();
                 reply["drvPath"] = drvPath;
                 for (auto out : outputs){
-                    reply["outputs"][out.first] = localStore->printStorePath(out.second);
+                    if (out.second) {
+                        reply["outputs"][out.first] = localStore->printStorePath(*out.second);
+                    }
                 }
 
                 if (myArgs.meta) {