From 908a9c5c8616d215334b6225b0c9141032ea16e3 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 14 Apr 2025 16:31:34 +0200 Subject: [PATCH] chore: adapt flake.nix for Linux Signed-off-by: Harald Hoyer --- flake.nix | 59 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 38c02ca..b827459 100644 --- a/flake.nix +++ b/flake.nix @@ -1,23 +1,56 @@ { inputs.nixify.url = "github:rvolosatovs/nixify"; - outputs = {nixify, ...}: - nixify.lib.rust.mkFlake { + outputs = + { nixify, ... }: + with nixify.lib; + rust.mkFlake { src = ./.; - buildOverrides = { - pkgs, - pkgsCross ? pkgs, - ... - }: { - buildInputs ? [], - depsBuildBuild ? [], - ... - }: - with pkgs.lib; { + withDevShells = + { + devShells, + pkgs, + ... + }: + extendDerivations { + buildInputs = with pkgs; [ + pkgs.pkg-config + pkgs.alsa-lib.dev + pkgs.udev.dev + xorg.libX11 + xorg.libXcursor + xorg.libxcb + xorg.libXi + libxkbcommon + ]; + } devShells; + + buildOverrides = + { + pkgs, + pkgsCross ? pkgs, + ... + }: + { + buildInputs ? [ ], + nativeBuildInputs ? [ ], + depsBuildBuild ? [ ], + ... + }: + with pkgs.lib; + { + nativeBuildInputs = + nativeBuildInputs + ++ optional (pkgs.stdenv.hostPlatform.isLinux) [ pkgs.pkg-config ]; + buildInputs = buildInputs - ++ optional pkgs.stdenv.hostPlatform.isDarwin pkgs.libiconv; + ++ optional pkgs.stdenv.hostPlatform.isDarwin pkgs.libiconv + ++ optional (pkgs.stdenv.hostPlatform.isLinux) [ + pkgs.alsa-lib.dev + pkgs.udev.dev + ]; depsBuildBuild = depsBuildBuild