diff options
author | Jade Lovelace <lix@jade.fyi> | 2024-06-26 00:44:46 -0700 |
---|---|---|
committer | Jade Lovelace <lix@jade.fyi> | 2024-06-26 00:44:46 -0700 |
commit | f7d54cb6b106fc24673f62c9dce050615d71eb1d (patch) | |
tree | 82801e6a7a93810d78dca1195f3a68e51a248391 /package.nix | |
parent | 4ac2c496d499a4a0e2d64edf32eb855268e7aa8d (diff) |
packaging: make pegtl use the __forDefaults mechanism
This avoids needing to pass it in when callPackage'ing Lix from external
code.
Change-Id: Ie07e84a151e38614064609a2f6dbff165e193be7
Diffstat (limited to 'package.nix')
-rw-r--r-- | package.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/package.nix b/package.nix index f75454254..f70cbb3b1 100644 --- a/package.nix +++ b/package.nix @@ -14,6 +14,7 @@ boost, brotli, bzip2, + callPackage, cmake, curl, doxygen, @@ -34,7 +35,7 @@ meson, ninja, openssl, - pegtl, + pegtl ? __forDefaults.pegtl, pkg-config, python3, rapidcheck, @@ -75,8 +76,10 @@ configureFlags = prev.configureFlags or [ ] ++ [ (lib.enableFeature true "sigstop") ]; }); - lix-doc = pkgs.callPackage ./lix-doc/package.nix { }; - build-release-notes = pkgs.callPackage ./maintainers/build-release-notes.nix { }; + lix-doc = callPackage ./lix-doc/package.nix { }; + build-release-notes = callPackage ./maintainers/build-release-notes.nix { }; + + pegtl = callPackage ./misc/pegtl.nix { }; }, }: let @@ -380,7 +383,12 @@ stdenv.mkDerivation (finalAttrs: { # Export the patched version of boehmgc. # flake.nix exports that into its overlay. passthru = { - inherit (__forDefaults) boehmgc-nix editline-lix build-release-notes; + inherit (__forDefaults) + boehmgc-nix + editline-lix + build-release-notes + pegtl + ; inherit officialRelease; |