From 3087681a1973a2d25805025671a3016ee65cd16d Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 2 Apr 2024 10:40:03 +0800 Subject: [PATCH] packages: remove compiler & library --- modules/packages/server/default.nix | 19 ++++++++++--------- modules/packages/workstation/default.nix | 4 +++- modules/system/default.nix | 6 +++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/modules/packages/server/default.nix b/modules/packages/server/default.nix index ad25b30e..b6313d7c 100644 --- a/modules/packages/server/default.nix +++ b/modules/packages/server/default.nix @@ -44,16 +44,17 @@ inputs: # office todo-txt-cli pdfgrep # development - gdb try inputs.topInputs.plasma-manager.packages.${inputs.pkgs.system}.rc2nix hexo-cli gh stdenv gfortran - nodejs + gdb try inputs.topInputs.plasma-manager.packages.${inputs.pkgs.system}.rc2nix hexo-cli gh + # install per project + # stdenv gfortran nodejs # library - fmt fmt.dev localPackages.nameof localPackages.matplotplusplus highfive hdf5 hdf5.dev - localPackages.concurrencpp localPackages.biu localPackages.magik-enum - ( - runCommand "concurrencpp" {} - "mkdir $out; ln -s ${localPackages.concurrencpp}/include/concurrencpp-* $out/include" - ) - eigen (runCommand "eigen" {} "mkdir $out; ln -s ${eigen}/include/eigen3 $out/include") + # fmt fmt.dev localPackages.nameof localPackages.matplotplusplus highfive hdf5 hdf5.dev + # localPackages.concurrencpp localPackages.biu localPackages.magik-enum + # ( + # runCommand "concurrencpp" {} + # "mkdir $out; ln -s ${localPackages.concurrencpp}/include/concurrencpp-* $out/include" + # ) + # eigen (runCommand "eigen" {} "mkdir $out; ln -s ${eigen}/include/eigen3 $out/include") # stupid things toilet lolcat ] diff --git a/modules/packages/workstation/default.nix b/modules/packages/workstation/default.nix index 309eff2d..744af33d 100644 --- a/modules/packages/workstation/default.nix +++ b/modules/packages/workstation/default.nix @@ -20,7 +20,9 @@ inputs: # instant messager qq nur-xddxdd.wechat-uos cinny-desktop nheko # development - jetbrains.clion android-studio dbeaver cling clang-tools_16 ccls fprettify aircrack-ng + jetbrains.clion android-studio dbeaver cling fprettify aircrack-ng + # install per project + # clang-tools_16 ccls # media nur-xddxdd.svp # virtualization diff --git a/modules/system/default.nix b/modules/system/default.nix index 0cf0d635..c9170c46 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -32,10 +32,10 @@ inputs: variables = { NIXOS_CONFIGURATION_REVISION = inputs.config.system.configurationRevision; - CPATH = "/run/current-system/sw/include"; - LIBRARY_PATH = "/run/current-system/sw/lib"; + # CPATH = "/run/current-system/sw/include"; + # LIBRARY_PATH = "/run/current-system/sw/lib"; }; - pathsToLink = [ "/include" ]; + # pathsToLink = [ "/include" ]; }; i18n = { defaultLocale = "C.UTF-8"; supportedLocales = [ "zh_CN.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "C.UTF-8/UTF-8" ]; };