attempt to enable nix-ld, doesn't work

This commit is contained in:
Miranda Marquez 2024-09-13 12:30:08 -08:00
parent 9b35f07779
commit 6917a60e2f
3 changed files with 17 additions and 2 deletions

View File

@ -63,6 +63,9 @@
}; };
}; };
# enable arbitrary programs, why is this not already on
# programs.nix-ld.enable = true;
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;

View File

@ -16,6 +16,10 @@
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-ld = {
url = "github:Mic92/nix-ld";
inputs.nixpkgs.follows = "nixpkgs";
};
nur.url = github:nix-community/NUR; nur.url = github:nix-community/NUR;
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
@ -39,6 +43,7 @@
nixpkgs, nixpkgs,
nixpkgs-unstable, nixpkgs-unstable,
lix-module, lix-module,
nix-ld,
home-manager, home-manager,
nur, nur,
... }: { ... }: {
@ -48,6 +53,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
nix-ld.nixosModules.nix-ld
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix" { "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix" {
networking.wireless.enable = false; networking.wireless.enable = false;
} }
@ -72,6 +78,7 @@
system = "aarch64-linux"; system = "aarch64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
nix-ld.nixosModules.nix-ld
./configuration.nix { ./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" ]; services.xserver.videoDrivers = [ "modesetting" ];
boot.binfmt.emulatedSystems = ["x86_64-linux"]; boot.binfmt.emulatedSystems = ["x86_64-linux"];
@ -105,6 +112,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
nix-ld.nixosModules.nix-ld
./configuration.nix { ./configuration.nix {
networking = { networking = {
hostName = "breakdown"; hostName = "breakdown";
@ -132,6 +140,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
nix-ld.nixosModules.nix-ld
./configuration.nix { ./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ]; services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
networking = { networking = {
@ -158,6 +167,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
nix-ld.nixosModules.nix-ld
# inputs.nur.nixosModules.nur # inputs.nur.nixosModules.nur
lix-module.nixosModules.default lix-module.nixosModules.default
./configuration.nix { ./configuration.nix {
@ -188,6 +198,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
nix-ld.nixosModules.nix-ld
./configuration.nix { ./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ]; services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
networking = { networking = {

View File

@ -22,8 +22,8 @@
builders-use-substitutes = true builders-use-substitutes = true
''; '';
# dynamic linker # dynamic linker
programs.nix-ld.enable = true; programs.nix-ld.dev.enable = true;
programs.nix-ld.libraries = with pkgs; [ programs.nix-ld.dev.libraries = with pkgs; [
cmake cmake
fontconfig fontconfig
harfbuzz harfbuzz
@ -36,6 +36,7 @@
cairo cairo
gdk-pixbuf gdk-pixbuf
zlib zlib
libz
xorg.libxcb xorg.libxcb
libxkbcommon libxkbcommon
libGL libGL