From d9aecbc3e0dca3d3ce34161473469d24c56f9660 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 8 Oct 2024 00:32:37 -0400 Subject: [PATCH] niri: cleanup dependencies Some of these were not required, not explicitly listed, or shouldn't always be added to the rpath --- pkgs/by-name/ni/niri/package.nix | 50 +++++++++++++++----------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index d5bcb5ef987b..ea3c2ed972ba 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -1,23 +1,22 @@ { lib, - rustPlatform, - fetchFromGitHub, - nix-update-script, - pkg-config, - libdisplay-info, - libxkbcommon, - pango, - pipewire, - seatd, - stdenv, - wayland, - systemd, - libinput, - mesa, - fontconfig, - libglvnd, autoPatchelfHook, clang, + dbus, + fetchFromGitHub, + libdisplay-info, + libglvnd, + libinput, + libxkbcommon, + mesa, + nix-update-script, + pango, + pipewire, + pkg-config, + rustPlatform, + seatd, + systemd, + wayland, }: rustPlatform.buildRustPackage rec { @@ -39,30 +38,29 @@ rustPlatform.buildRustPackage rec { }; }; + strictDeps = true; + nativeBuildInputs = [ - pkg-config - rustPlatform.bindgenHook autoPatchelfHook clang + pkg-config + rustPlatform.bindgenHook ]; buildInputs = [ - wayland - systemd # For libudev - seatd # For libseat + dbus libdisplay-info - libxkbcommon libinput + libxkbcommon mesa # For libgbm - fontconfig - stdenv.cc.cc.lib - pipewire pango + pipewire + seatd + systemd # Also includes libudev ]; runtimeDependencies = [ wayland - mesa libglvnd # For libEGL ];