summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authorTheArcaneBrony <myrainbowdash949@gmail.com>2023-11-11 18:43:54 +0100
committerTheArcaneBrony <myrainbowdash949@gmail.com>2023-11-11 18:43:54 +0100
commit1bc3681d1d0bb5a973dd64541646ffe3deac48a5 (patch)
tree2876e9564089b8c6c0194775db5f9be7ebc6d512 /modules
parentUpdates (diff)
downloadRory-Open-Architecture-1bc3681d1d0bb5a973dd64541646ffe3deac48a5.tar.xz
Cleanup, printing on desktop
Diffstat (limited to 'modules')
-rw-r--r--modules/packages/dotnet-pack.nix14
-rw-r--r--modules/packages/nheko-git.nix5
2 files changed, 5 insertions, 14 deletions
diff --git a/modules/packages/dotnet-pack.nix b/modules/packages/dotnet-pack.nix

index 27c419d..75a01a1 100644 --- a/modules/packages/dotnet-pack.nix +++ b/modules/packages/dotnet-pack.nix
@@ -1,19 +1,5 @@ { pkgs ? import <nixpkgs> {} }: -#pkgs.stdenv.mkDerivation { -# name = "dotnet-pack"; -# dontUnpack = true; -# buildInputs = with pkgs; [ dotnet-sdk dotnet-sdk_7 dotnet-sdk_8 ]; -# -# # Define the build phase -# buildPhase = '' -# mkdir -p $out -# ln -sf ${pkgs.dotnet-sdk}/* $out/ -# ln -sf ${pkgs.dotnet-sdk_7}/* $out/ -# ln -sf ${pkgs.dotnet-sdk_8}/* $out/ -# ''; -#} - pkgs.symlinkJoin { name = "dotnet-pack"; paths = [ pkgs.dotnet-sdk_8 pkgs.dotnet-sdk_7 pkgs.dotnet-sdk ]; diff --git a/modules/packages/nheko-git.nix b/modules/packages/nheko-git.nix
index dac42c9..0c14bab 100644 --- a/modules/packages/nheko-git.nix +++ b/modules/packages/nheko-git.nix
@@ -78,6 +78,11 @@ stdenv.mkDerivation { "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=OFF" + #Rory& + "-DMAN=OFF" + + ] ++ lib.optionals (!voipSupport) [ + "-DVOIP=OFF" ];