mirror of
https://github.com/NixOS/nix
synced 2025-06-25 02:21:16 +02:00
Use lib instead of explicit fileset passing
This commit is contained in:
parent
d40c59ed19
commit
85de5a60c7
13 changed files with 26 additions and 42 deletions
|
@ -1,12 +1,10 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, stdenv
|
||||
, releaseTools
|
||||
, autoconf-archive
|
||||
, autoreconfHook
|
||||
, aws-sdk-cpp
|
||||
, boehmgc
|
||||
, buildPackages
|
||||
, nlohmann_json
|
||||
, bison
|
||||
, boost
|
||||
|
@ -15,7 +13,6 @@
|
|||
, curl
|
||||
, editline
|
||||
, readline
|
||||
, fileset
|
||||
, flex
|
||||
, git
|
||||
, gtest
|
||||
|
@ -50,7 +47,6 @@
|
|||
, pname ? "nix"
|
||||
|
||||
, versionSuffix ? ""
|
||||
, officialRelease ? false
|
||||
|
||||
# Whether to build Nix. Useful to skip for tasks like testing existing pre-built versions of Nix
|
||||
, doBuild ? true
|
||||
|
@ -113,6 +109,8 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
|
||||
# selected attributes with defaults, will be used to define some
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue