From a6a7e29893ac68e72c9ff3734eda506de2b24daf Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Mon, 2 Dec 2024 12:44:14 +0100 Subject: [PATCH] Add nix compat using nix-ld --- hosts/common/optional/fhs-compat.nix | 69 ++++++++++++++++++++++++++++ hosts/ludwig/default.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 hosts/common/optional/fhs-compat.nix diff --git a/hosts/common/optional/fhs-compat.nix b/hosts/common/optional/fhs-compat.nix new file mode 100644 index 0000000..c0dc09a --- /dev/null +++ b/hosts/common/optional/fhs-compat.nix @@ -0,0 +1,69 @@ +{ + pkgs, + lib, + config, + ... +}: { + services.envfs.enable = lib.mkDefault true; + + programs.nix-ld.enable = lib.mkDefault true; + programs.nix-ld.libraries = with pkgs; + [ + acl + attr + bzip2 + dbus + expat + fontconfig + freetype + fuse3 + icu + libnotify + libsodium + libssh + libunwind + libusb1 + libuuid + nspr + nss + stdenv.cc.cc + util-linux + zlib + zstd + ] + ++ lib.optionals (config.hardware.graphics.enable) [ + pipewire + cups + libxkbcommon + pango + mesa + libdrm + libglvnd + libpulseaudio + atk + cairo + alsa-lib + at-spi2-atk + at-spi2-core + gdk-pixbuf + glib + gtk3 + libGL + libappindicator-gtk3 + vulkan-loader + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxcb + xorg.libxkbfile + xorg.libxshmfence + ]; +} diff --git a/hosts/ludwig/default.nix b/hosts/ludwig/default.nix index e754171..78c89ee 100644 --- a/hosts/ludwig/default.nix +++ b/hosts/ludwig/default.nix @@ -34,6 +34,7 @@ ../common/optional/desktop/japanese.nix ../common/optional/udisks.nix ../common/optional/tailscale.nix + ../common/optional/fhs-compat.nix ]; nixpkgs = { @@ -64,6 +65,7 @@ }; networking.hostName = "ludwig"; + systemd.services.NetworkManager-wait-online.enable = false; services.udev.packages = [pkgs.segger-jlink];