From d27c346b9e28d9748985ac54e960b650017f720a Mon Sep 17 00:00:00 2001 From: Gokul Swaminathan <33443763+JavaCafe01@users.noreply.github.com> Date: Tue, 22 Nov 2022 11:24:38 -0800 Subject: [PATCH] Added flake support for wlroots subproject (#60) --- flake.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 880bf2c4..1d1288d9 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,6 @@ outputs = { self, nixpkgs, flake-compat, ... }: let - inherit (nixpkgs) lib; - pkgsFor = system: import nixpkgs { inherit system; @@ -21,7 +19,8 @@ }; targetSystems = [ "aarch64-linux" "x86_64-linux" ]; - in { + in + { overlays.default = final: prev: { swayfx-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { src = builtins.path { path = prev.lib.cleanSource ./.; }; }); @@ -34,11 +33,14 @@ }); devShells = nixpkgs.lib.genAttrs targetSystems (system: - let pkgs = pkgsFor system; - in { + let + pkgs = pkgsFor system; + in + { default = pkgs.mkShell { name = "swayfx-shell"; depsBuildBuild = with pkgs; [ pkg-config ]; + inputsFrom = [ self.packages.${system}.swayfx-unwrapped pkgs.wlroots ]; nativeBuildInputs = with pkgs; [ cmake @@ -49,7 +51,11 @@ scdoc ]; - inputsFrom = [ self.packages.${system}.swayfx-unwrapped ]; + shellHook = with pkgs; ''( + mkdir -p "$PWD/subprojects" + cd "$PWD/subprojects" + cp -R --no-preserve=mode,ownership ${wlroots.src} wlroots + )''; }; }); };