Remove private specificities from pure-ftpd package and lib

2 files changed, 21 insertions, 19 deletions

diff --git a/lib/default.nix b/lib/default.nix
index 1baee1f..6b3dfdf 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -61,22 +61,4 @@ rec {
         makeWrapper "$f" "$out" ${toString args}
       '';
 
-  # This adds header colors to the builds, but it rebuilds the whole
-  # world from scratch, so only use it to debug!
-  # add it as postHook in derivations
-  immaePostHook = ''
-    header() {
-      echo -ne "\033[1;36m"
-      echo -n "$1"
-      echo -e "\033[0m"
-    }
-
-    echoCmd() {
-      printf "\033[1;34m%s:\033[0m" "$1"
-      shift
-      printf ' %q' "$@"
-      echo
-    }
-  '';
-
-} // (if builtins.pathExists ./lib/private then import ./lib/private else {})
+} // (if builtins.pathExists ./private then callPackage ./private {} else {})
diff --git a/lib/private/default.nix b/lib/private/default.nix
new file mode 100644
index 0000000..c7d753a
--- /dev/null
+++ b/lib/private/default.nix
@@ -0,0 +1,20 @@
+{}:
+{
+  # This adds header colors to the builds, but it rebuilds the whole
+  # world from scratch, so only use it to debug!
+  # add it as postHook in derivations
+  immaePostHook = ''
+    header() {
+      echo -ne "\033[1;36m"
+      echo -n "$1"
+      echo -e "\033[0m"
+    }
+
+    echoCmd() {
+      printf "\033[1;34m%s:\033[0m" "$1"
+      shift
+      printf ' %q' "$@"
+      echo
+    }
+  '';
+}