From 58d5f37b020e00bd36a7f1b171b3891208fc7b17 Mon Sep 17 00:00:00 2001 From: wxlyyy <1556588440@qq.com> Date: Fri, 7 Nov 2025 16:12:33 +0800 Subject: [PATCH] Nix: cleanup package --- nix/package.nix | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/nix/package.nix b/nix/package.nix index a5d079177..cacec580c 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,25 +1,16 @@ { version ? "dirty", lib, - stdenv, + stdenvNoCC, # build - gcc, qt6, quickshell, - xkeyboard_config, # runtime deps - bash, - bluez, brightnessctl, cava, cliphist, - coreutils, ddcutil, - file, - findutils, - libnotify, matugen, - networkmanager, wlsunset, wl-clipboard, gpu-screen-recorder, # optional @@ -33,6 +24,7 @@ filter = path: type: !(builtins.any (prefix: lib.path.hasPrefix (../. + prefix) (/. + path)) [ /.github + /.gitignore /Assets/Screenshots /Assets/Wallpaper /Bin/dev @@ -41,60 +33,55 @@ /README.md /flake.nix /flake.lock + /shell.nix + /lefthook.yml + /CLAUDE.md ]); }; runtimeDeps = [ - bash - bluez brightnessctl cava cliphist - coreutils ddcutil - file - findutils - libnotify matugen - networkmanager wlsunset wl-clipboard ] - ++ lib.optionals (stdenv.hostPlatform.isx86_64) [gpu-screen-recorder]; + ++ lib.optionals (stdenvNoCC.hostPlatform.system == "x86_64-linux") [ + gpu-screen-recorder + ]; - fontconfig = makeFontsConf { + fontsConf = makeFontsConf { fontDirectories = [ roboto inter-nerdfont ]; }; in - stdenv.mkDerivation { + stdenvNoCC.mkDerivation { pname = "noctalia-shell"; inherit version src; nativeBuildInputs = [ - gcc qt6.wrapQtAppsHook ]; + buildInputs = [ - quickshell - xkeyboard_config qt6.qtbase ]; - propagatedBuildInputs = runtimeDeps; installPhase = '' mkdir -p $out/share/noctalia-shell $out/bin - cp -r ./* $out/share/noctalia-shell - cp ${quickshell}/bin/qs $out/bin/noctalia-shell + cp -r . $out/share/noctalia-shell + ln -s ${quickshell}/bin/qs $out/bin/noctalia-shell ''; preFixup = '' qtWrapperArgs+=( --prefix PATH : ${lib.makeBinPath runtimeDeps} - --set FONTCONFIG_FILE ${fontconfig} + --set FONTCONFIG_FILE ${fontsConf} --add-flags "-p $out/share/noctalia-shell" ) '';