remove samba from closure

current samba hangs during configurePhase. this is not the first time samba has failed to build. nor the third. purge it.
This commit is contained in:
Colin 2024-02-01 15:28:40 +00:00
parent a9810e7343
commit 715ac42f13
6 changed files with 38 additions and 2 deletions

View File

@ -39,9 +39,11 @@
./gpodder.nix
./gthumb.nix
./gtkcord4.nix
./handbrake.nix
./helix.nix
./imagemagick.nix
./jellyfin-media-player.nix
./kdenlive.nix
./komikku.nix
./koreader
./libreoffice.nix

View File

@ -0,0 +1,11 @@
{ pkgs, ... }:
{
sane.programs.handbrake = {
# disable expensive sambda dependency; i don't use it.
packageUnwrapped = pkgs.handbrake.override {
ffmpeg_5-full = pkgs.ffmpeg_5-full.override {
withSamba = false;
};
};
};
}

View File

@ -0,0 +1,11 @@
{ pkgs, ... }:
{
sane.programs.kdenlive = {
packageUnwrapped = pkgs.kdenlive.override {
ffmpeg-full = pkgs.ffmpeg-full.override {
# avoid expensive samba build for a feature i don't use
withSamba = false;
};
};
};
}

View File

@ -1,4 +1,4 @@
{ config, lib, sane-lib, ... }:
{ config, lib, pkgs, sane-lib, ... }:
let
feeds = sane-lib.feeds;
@ -10,6 +10,10 @@ let
in
{
sane.programs.vlc = {
packageUnwrapped = pkgs.vlc.override {
# disable uneeded samba features to avoid an expensive samba build
samba = null;
};
sandbox.method = "bwrap";
sandbox.wrapperType = "wrappedDerivation";
sandbox.autodetectCliPaths = true;

View File

@ -1,6 +1,10 @@
{ ... }:
{ pkgs, ... }:
{
sane.programs.wine = {
# `pkgs.wine == pkgs.winePackages.full`
# not sure the practical difference between `full` and `base`, but `full` drags in thngs like samba which i _probably_ don't need.
# could build with `supportFlags.netapiSupport = false` to use `full` but without samba.
packageUnwrapped = pkgs.winePackages.base;
# no need for the cryptographic nature, just needs to not use loads of / tmpfs.
persist.byStore.cryptClearOnBoot = [ ".wine" ];
persist.byStore.plaintext = [

View File

@ -253,6 +253,10 @@ in
pulse.enable = true;
};
services.gvfs.enable = true; # allow nautilus to mount remote filesystems (e.g. ftp://...)
services.gvfs.package = lib.mkDefault (pkgs.gvfs.override {
# i don't need to mount samba shares, and samba build is expensive/flaky (mostly for cross, but even problematic on native)
samba = null;
});
# rtkit/RealtimeKit: allow applications which want realtime audio (e.g. Dino? Pulseaudio server?) to request it.
# this might require more configuration (e.g. polkit-related) to work exactly as desired.
# - readme outlines requirements: <https://github.com/heftig/rtkit>