From 23d2f2b0fdf31e86e99b0b2bd5222e7212911a84 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 11 Sep 2019 16:53:36 +0200
Subject: [PATCH] Always deterministic, composable on newer Nixpkgs

---
 default.nix | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/default.nix b/default.nix
index 888bab0..0f381ac 100644
--- a/default.nix
+++ b/default.nix
@@ -1,13 +1,34 @@
 { lib ? import <nixpkgs/lib> }:
 let
   find-files = import ./find-files.nix { inherit lib; };
+
+  newCleanSourceWith =
+    let newSrc = lib.cleanSourceWith { filter = f: t: true; src = ./.; };
+    in (builtins.functionArgs lib.cleanSourceWith) ? name || newSrc ? name;
+
 in
 {
   inherit (find-files) gitignoreFilter;
-  
-  gitignoreSource = path: lib.cleanSourceWith {
-    name = "source";
-    filter = find-files.gitignoreFilter path;
-    src = path;
-  };
+
+  gitignoreSource =
+    if newCleanSourceWith
+    then
+      path:
+        let
+          origPath = path.origPath or path;
+        in
+        lib.cleanSourceWith {
+          name = "source";
+          filter = find-files.gitignoreFilter origPath;
+          src = path;
+        }
+    else
+      path:
+        if path ? _isLibCleanSourceWith
+        then builtins.abort "Sorry, please update your Nixpkgs if you want to use gitignoreSource on cleanSourceWith"
+        else builtins.path {
+          name = "source";
+          filter = find-files.gitignoreFilter path;
+          inherit path;
+        };
 }