diff options
author | Qyriad <qyriad@qyriad.me> | 2024-04-06 18:12:35 -0600 |
---|---|---|
committer | Qyriad <qyriad@qyriad.me> | 2024-04-07 23:10:05 +0000 |
commit | 0c5e2cfb33199d623883c5aa7b48aff31da10976 (patch) | |
tree | 7450fc20e4e503885721db24eb65b1edc6c3026a /flake.nix | |
parent | 3ac2dd061302df1625a41b0f0f979ce2504560f0 (diff) |
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
Diffstat (limited to 'flake.nix')
-rw-r--r-- | flake.nix | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -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; }; |