From 0c5e2cfb33199d623883c5aa7b48aff31da10976 Mon Sep 17 00:00:00 2001
From: Qyriad <qyriad@qyriad.me>
Date: Sat, 6 Apr 2024 18:12:35 -0600
Subject: [PATCH] package: just use fileset from lib

The following command is now sufficient to build Lix from outside of the
flake:

nix-build -E 'let pkgs = import <nixpkgs> { }; in pkgs.callPackage
./package.nix { build-release-notes = false; nix-doc = pkgs.callPackage
./nix-doc/package.nix { }; }'

Change-Id: Ie6b14b446480ac07c7266d4fba20042b04cc35b9
---
 flake.nix   | 9 +++------
 package.nix | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 25d025b1c..6dde0e2a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,6 @@
 
     let
       inherit (nixpkgs) lib;
-      inherit (lib) fileset;
 
       officialRelease = true;
 
@@ -92,8 +91,6 @@
             (lib.versionAtLeast daemon.version "2.4pre20211005" &&
             lib.versionAtLeast client.version "2.4pre20211005")
             "-${client.version}-against-${daemon.version}";
-
-            inherit fileset;
         };
       in nix.overrideAttrs (prevAttrs: {
         NIX_DAEMON_PACKAGE = daemon;
@@ -191,7 +188,7 @@
           nix-doc = final.callPackage ./nix-doc/package.nix {};
 
           nix = final.callPackage ./package.nix {
-            inherit versionSuffix fileset;
+            inherit versionSuffix;
             stdenv = currentStdenv;
             busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
             nix-doc = final.nix-doc;
@@ -258,7 +255,7 @@
           inherit (nixpkgs) pkgs;
 
           nix = pkgs.callPackage ./package.nix {
-            inherit versionSuffix fileset officialRelease buildUnreleasedNotes;
+            inherit versionSuffix officialRelease buildUnreleasedNotes;
             inherit (pkgs) build-release-notes;
             internalApiDocs = true;
             busybox-sandbox-shell = pkgs.busybox-sandbox-shell;
@@ -397,7 +394,7 @@
         makeShell = pkgs: stdenv:
           let
             nix = pkgs.callPackage ./package.nix {
-              inherit stdenv versionSuffix fileset;
+              inherit stdenv versionSuffix;
               busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox;
               forDevShell = true;
             };
diff --git a/package.nix b/package.nix
index 8b1fb48ff..b972407f1 100644
--- a/package.nix
+++ b/package.nix
@@ -21,7 +21,6 @@
   curl,
   doxygen,
   editline,
-  fileset,
   flex,
   git,
   gtest,
@@ -85,6 +84,7 @@
   },
 }: let
   inherit (__forDefaults) canRunInstalled;
+  inherit (lib) fileset;
 
   version = lib.fileContents ./.version + versionSuffix;