From e31b5e4d29d923db89eab617eed59c42535dee4d Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 7 Oct 2022 21:37:53 +1300
Subject: [PATCH] mk-poetry-dep: prevent use of output separation

this doesn't work in a lot of cases and I don't see the point for us
to have the split output behaviour.
---
 mk-poetry-dep.nix | 4 +++-
 shell-scripts.nix | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mk-poetry-dep.nix b/mk-poetry-dep.nix
index 22f8e34..857a824 100644
--- a/mk-poetry-dep.nix
+++ b/mk-poetry-dep.nix
@@ -94,7 +94,8 @@ pythonPackages.callPackage
       pname = normalizePackageName name;
       version = version;
 
-      inherit format;
+      # Circumvent output separation (https://github.com/NixOS/nixpkgs/pull/190487)
+      format = if format == "pyproject" then "poetry2nix" else format;
 
       doCheck = false; # We never get development deps
 
@@ -108,6 +109,7 @@ pythonPackages.callPackage
       ++ lib.optionals (format == "pyproject") [
         pythonPackages.removePathDependenciesHook
         pythonPackages.removeGitDependenciesHook
+        pythonPackages.pipBuildHook
       ];
 
       buildInputs = (
diff --git a/shell-scripts.nix b/shell-scripts.nix
index cbaa443..23362a2 100644
--- a/shell-scripts.nix
+++ b/shell-scripts.nix
@@ -34,6 +34,8 @@ python.pkgs.buildPythonPackage {
   dontConfigure = true;
   dontUseSetuptoolsCheck = true;
 
+  format = "poetry2nix";
+
   installPhase = ''
     mkdir -p $out/bin
     ${lib.concatStringsSep "\n" (lib.mapAttrsToList mkScript scripts)}