From ceece00d04032a278f125170cacf1f5f8253f074 Mon Sep 17 00:00:00 2001
From: shimun <shimun@shimun.net>
Date: Mon, 28 Dec 2020 18:23:44 +0100
Subject: [PATCH] explicit unfiltered src

---
 default.nix | 11 ++++-------
 flake.nix   |  4 ++--
 mod.nix     |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/default.nix b/default.nix
index d0615b4..c2deb40 100644
--- a/default.nix
+++ b/default.nix
@@ -6,8 +6,8 @@
 , src ? ./.
 }:
 let
-  filteredSrc = builtins.filterSource pkgs.lib.cleanSourceFilter src;
-  crate2nix_tools = import "${fetchgit { url = "https://github.com/kolloch/crate2nix.git"; rev = "adecff03c53b87255b3299f5a5787327342a69b2"; sha256 = "0l10yqa3gq73fc4xc977vb9zk5jlp70xiz5qd9c1vq873yqk1c7g"; }}/tools.nix" { inherit pkgs; };
+  filteredSrc = src; # flake only includeds filed tracked by git builtins.filterSource pkgs.lib.cleanSourceFilter src;
+  crate2nix_tools = import "${fetchGit { url = "https://github.com/kolloch/crate2nix.git"; rev = "9f3f42bfecebbc3be5526a4194c82fdfc53269e9"; }}/tools.nix" { inherit pkgs; };
   overrides = with pkgs; let
     clang = llvmPackages_10.clang;
     libclang = llvmPackages_10.libclang;
@@ -23,14 +23,11 @@ let
     };
   };
   client = with pkgs; runCommandLocal "brownpaper" {
-    script = ./bp.sh;
+    script = "${filteredSrc}/bp.sh";
     nativeBuildInputs = [ makeWrapper ];
   } ''
     makeWrapper $script $out/bin/brownpaper \
     --prefix PATH : ${lib.makeBinPath [ bash curl gnupg ]}
   '';
-  # client = pkgs.writeShellScriptBin "brownpaper" ''
-  #   PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} "$@"
-  # '';
 in
-{ server = callPackage (crate2nix_tools.generatedCargoNix { inherit name; src = filteredSrc; }) { inherit pkgs; defaultCrateOverrides = overrides; };  inherit client; }
+{ server = (callPackage (crate2nix_tools.generatedCargoNix { inherit name; src = filteredSrc; }) { inherit pkgs; defaultCrateOverrides = overrides; }).rootCrate.build;  inherit client; }
diff --git a/flake.nix b/flake.nix
index 760573c..b34ff2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,12 +3,12 @@
 
   outputs = { self, nixpkgs }: rec {
     nixosModules.brownpaper = import ./mod.nix;
-    packages =
+    legacyPackages =
       let
         pkg = system:
           let
             pkgs = import nixpkgs { inherit system; };
-            bp = pkgs.callPackage ./default.nix { inherit pkgs; };
+            bp = pkgs.callPackage ./default.nix { inherit pkgs; src = ./.; };
           in
           { brownpaper = bp.client; brownpaper-server = bp.server; };
       in
diff --git a/mod.nix b/mod.nix
index 3427a0b..32e38c0 100644
--- a/mod.nix
+++ b/mod.nix
@@ -87,7 +87,7 @@ in
       serviceConfig =
         {
           BindPaths = [ cfg.dataDir ];
-          ExecStart = "${package.server.rootCrate.build}/bin/brownpaper ${cfg.listen}:${toString cfg.port}";
+          ExecStart = "${package.server}/bin/brownpaper ${cfg.listen}:${toString cfg.port}";
           User = cfg.user;
         };
     };