From 6917a60e2f1c95b5915448eb4bd196433930f4a4 Mon Sep 17 00:00:00 2001 From: Miranda Marquez Date: Fri, 13 Sep 2024 12:30:08 -0800 Subject: [PATCH] attempt to enable nix-ld, doesn't work --- configuration.nix | 3 +++ flake.nix | 11 +++++++++++ modules/nix-settings.nix | 5 +++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index a3cc447..05ceb99 100644 --- a/configuration.nix +++ b/configuration.nix @@ -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). # services.xserver.libinput.enable = true; diff --git a/flake.nix b/flake.nix index 419c09f..49b67f7 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,10 @@ url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-ld = { + url = "github:Mic92/nix-ld"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nur.url = github:nix-community/NUR; home-manager = { url = "github:nix-community/home-manager/release-24.05"; @@ -39,6 +43,7 @@ nixpkgs, nixpkgs-unstable, lix-module, + nix-ld, home-manager, nur, ... }: { @@ -48,6 +53,7 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ + nix-ld.nixosModules.nix-ld "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix" { networking.wireless.enable = false; } @@ -72,6 +78,7 @@ system = "aarch64-linux"; specialArgs = { inherit inputs; }; modules = [ + nix-ld.nixosModules.nix-ld ./configuration.nix { services.xserver.videoDrivers = [ "modesetting" ]; boot.binfmt.emulatedSystems = ["x86_64-linux"]; @@ -105,6 +112,7 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ + nix-ld.nixosModules.nix-ld ./configuration.nix { networking = { hostName = "breakdown"; @@ -132,6 +140,7 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ + nix-ld.nixosModules.nix-ld ./configuration.nix { services.xserver.videoDrivers = [ "modesetting" "displaylink" ]; networking = { @@ -158,6 +167,7 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ + nix-ld.nixosModules.nix-ld # inputs.nur.nixosModules.nur lix-module.nixosModules.default ./configuration.nix { @@ -188,6 +198,7 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ + nix-ld.nixosModules.nix-ld ./configuration.nix { services.xserver.videoDrivers = [ "modesetting" "displaylink" ]; networking = { diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 1f51025..686fd7d 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -22,8 +22,8 @@ builders-use-substitutes = true ''; # dynamic linker - programs.nix-ld.enable = true; - programs.nix-ld.libraries = with pkgs; [ + programs.nix-ld.dev.enable = true; + programs.nix-ld.dev.libraries = with pkgs; [ cmake fontconfig harfbuzz @@ -36,6 +36,7 @@ cairo gdk-pixbuf zlib + libz xorg.libxcb libxkbcommon libGL