From 0f1b7cf91636357797bdec054576e1c735d7040a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 28 Sep 2023 12:05:19 +0200
Subject: [PATCH] clan-cli: symlink cli into an otherwise empty package

This avoids propagating unneeded python libraries
---
 formatter.nix                  |  2 +-
 pkgs/clan-cli/default.nix      |  5 -----
 pkgs/clan-cli/flake-module.nix | 12 +++++++++---
 pkgs/clan-cli/shell.nix        |  6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/formatter.nix b/formatter.nix
index 28b3de2bd..cb4eb0d7e 100644
--- a/formatter.nix
+++ b/formatter.nix
@@ -21,7 +21,7 @@
 
     treefmt.programs.mypy.enable = true;
     treefmt.programs.mypy.directories = {
-      "pkgs/clan-cli".extraPythonPackages = self'.packages.clan-cli.pytestDependencies;
+      "pkgs/clan-cli".extraPythonPackages = self'.packages.clan-cli-unwrapped.pytestDependencies;
     };
 
     treefmt.settings.formatter.nix = {
diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix
index 3567fa2fa..a6dccf1d0 100644
--- a/pkgs/clan-cli/default.nix
+++ b/pkgs/clan-cli/default.nix
@@ -146,11 +146,6 @@ python3.pkgs.buildPythonApplication {
     installShellCompletion --fish --name clan.fish \
       <(${argcomplete}/bin/register-python-argcomplete --shell fish clan)
   '';
-  # Don't leak python packages into a devshell.
-  # It can be very confusing if you `nix run` than than load the cli from the devshell instead.
-  postFixup = ''
-    rm $out/nix-support/propagated-build-inputs
-  '';
   checkPhase = ''
     PYTHONPATH= $out/bin/clan --help
     if grep --include \*.py -Rq "breakpoint()" $out; then
diff --git a/pkgs/clan-cli/flake-module.nix b/pkgs/clan-cli/flake-module.nix
index dbb91c076..283df5300 100644
--- a/pkgs/clan-cli/flake-module.nix
+++ b/pkgs/clan-cli/flake-module.nix
@@ -2,14 +2,20 @@
 {
   perSystem = { self', pkgs, ... }: {
     devShells.clan-cli = pkgs.callPackage ./shell.nix {
-      inherit (self'.packages) clan-cli ui-assets nix-unit;
+      inherit (self'.packages) clan-cli-unwrapped ui-assets nix-unit;
     };
     packages = {
-      clan-cli = pkgs.python3.pkgs.callPackage ./default.nix {
+      clan-cli-unwrapped = pkgs.python3.pkgs.callPackage ./default.nix {
         inherit (self'.packages) ui-assets;
         inherit (inputs) nixpkgs;
       };
-      clan-openapi = self'.packages.clan-cli.clan-openapi;
+      # Don't leak python packages into a devshell.
+      # It can be very confusing if you `nix run` than than load the cli from the devshell instead.
+      clan-cli = pkgs.runCommand "clan-cli" { } ''
+        mkdir $out
+        ln -s ${self'.packages.clan-cli-unwrapped}/bin $out
+      '';
+      inherit (self'.packages.clan-cli-unwrapped) clan-openapi;
       default = self'.packages.clan-cli;
     };
 
diff --git a/pkgs/clan-cli/shell.nix b/pkgs/clan-cli/shell.nix
index 6d53c9c98..b05612bd3 100644
--- a/pkgs/clan-cli/shell.nix
+++ b/pkgs/clan-cli/shell.nix
@@ -1,4 +1,4 @@
-{ nix-unit, clan-cli, ui-assets, system, mkShell, writeScriptBin, openssh }:
+{ nix-unit, clan-cli-unwrapped, ui-assets, system, mkShell, writeScriptBin, openssh }:
 let
   checkScript = writeScriptBin "check" ''
     nix build .#checks.${system}.{treefmt,clan-pytest} -L "$@"
@@ -8,14 +8,14 @@ mkShell {
   packages = [
     nix-unit
     openssh
-    clan-cli.checkPython
+    clan-cli-unwrapped.checkPython
   ];
 
   shellHook = ''
     tmp_path=$(realpath ./.direnv)
 
     rm -f clan_cli/nixpkgs clan_cli/webui/assets
-    ln -sf ${clan-cli.nixpkgs} clan_cli/nixpkgs
+    ln -sf ${clan-cli-unwrapped.nixpkgs} clan_cli/nixpkgs
     ln -sf ${ui-assets} clan_cli/webui/assets
 
     export PATH="$tmp_path/bin:${checkScript}/bin:$PATH"