From 76b1b46e0b4c84afb43719bf00d07097f211d02d Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 14 Oct 2022 09:37:46 -0700 Subject: [PATCH] chore(flake.nix): use propagatedBuildInputs --- flake.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 729cd641..9361decb 100644 --- a/flake.nix +++ b/flake.nix @@ -16,16 +16,17 @@ packagesFor = forAllSystems (system: let pkgs = nixpkgsFor.${system}; - in with pkgs; { + in with pkgs; rec { nativeBuildInputs = [ meson pkg-config ninja vala gobject-introspection ]; buildInputs = [ libxml2 glib libgee ]; + propagatedBuildInputs = buildInputs; }); in { packages = forAllSystems (system: let pkgs = nixpkgsFor.${system}; - systemPackages = packagesFor.${system}; + packages = packagesFor.${system}; in { default = pkgs.stdenv.mkDerivation rec { name = "gxml"; @@ -38,7 +39,7 @@ doCheck = true; enableParallelBuilding = true; - inherit (systemPackages) nativeBuildInputs buildInputs; + inherit (packages) nativeBuildInputs buildInputs propagatedBuildInputs; meta = with pkgs.lib; { description = "GXml provides a GObject API for manipulating XML and a Serializable framework from GObject to XML."; @@ -53,10 +54,10 @@ devShells = forAllSystems (system: let pkgs = nixpkgsFor.${system}; - systemPackages = packagesFor.${system}; + packages = packagesFor.${system}; in { default = pkgs.mkShell { - packages = systemPackages.nativeBuildInputs ++ systemPackages.buildInputs; + packages = packages.nativeBuildInputs ++ packages.buildInputs; }; }); }; -- GitLab