lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

package: just use fileset from lib

Browse source 
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
This commit is contained in:
Qyriad 2024-04-06 18:12:35 -06:00
parent 3ac2dd0613
commit 0c5e2cfb33
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
flake.nix
View file

@ -19,7 +19,6 @@
let let
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
inherit (lib) fileset;
officialRelease = true; officialRelease = true;
@ -92,8 +91,6 @@
(lib.versionAtLeast daemon.version "2.4pre20211005" && (lib.versionAtLeast daemon.version "2.4pre20211005" &&
lib.versionAtLeast client.version "2.4pre20211005") lib.versionAtLeast client.version "2.4pre20211005")
"-${client.version}-against-${daemon.version}"; "-${client.version}-against-${daemon.version}";
inherit fileset;
}; };
in nix.overrideAttrs (prevAttrs: { in nix.overrideAttrs (prevAttrs: {
NIX_DAEMON_PACKAGE = daemon; NIX_DAEMON_PACKAGE = daemon;
@ -191,7 +188,7 @@
nix-doc = final.callPackage ./nix-doc/package.nix {}; nix-doc = final.callPackage ./nix-doc/package.nix {};
nix = final.callPackage ./package.nix { nix = final.callPackage ./package.nix {
inherit versionSuffix fileset; inherit versionSuffix;
stdenv = currentStdenv; stdenv = currentStdenv;
busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell; busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
nix-doc = final.nix-doc; nix-doc = final.nix-doc;
@ -258,7 +255,7 @@
inherit (nixpkgs) pkgs; inherit (nixpkgs) pkgs;
nix = pkgs.callPackage ./package.nix { nix = pkgs.callPackage ./package.nix {
inherit versionSuffix fileset officialRelease buildUnreleasedNotes; inherit versionSuffix officialRelease buildUnreleasedNotes;
inherit (pkgs) build-release-notes; inherit (pkgs) build-release-notes;
internalApiDocs = true; internalApiDocs = true;
busybox-sandbox-shell = pkgs.busybox-sandbox-shell; busybox-sandbox-shell = pkgs.busybox-sandbox-shell;
@ -397,7 +394,7 @@
makeShell = pkgs: stdenv: makeShell = pkgs: stdenv:
let let
nix = pkgs.callPackage ./package.nix { nix = pkgs.callPackage ./package.nix {
inherit stdenv versionSuffix fileset; inherit stdenv versionSuffix;
busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox; busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox;
forDevShell = true; forDevShell = true;
}; };

2
package.nix
View file

@ -21,7 +21,6 @@
curl, curl,
doxygen, doxygen,
editline, editline,
fileset,
flex, flex,
git, git,
gtest, gtest,
@ -85,6 +84,7 @@
}, },
}: let }: let
inherit (__forDefaults) canRunInstalled; inherit (__forDefaults) canRunInstalled;
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;