From 84742e08924372b850f3db3a936c1aa3a2d1c5eb Mon Sep 17 00:00:00 2001 From: Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com> Date: Sun, 18 May 2025 18:17:42 +0530 Subject: [PATCH] feat: nix-ld for ootb uv support --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 8 +++++++- hosts/default/configuration.nix | 4 ++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index bc1c5fe..20a3642 100644 --- a/flake.lock +++ b/flake.lock @@ -427,6 +427,26 @@ "type": "github" } }, + "nix-ld": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747037786, + "narHash": "sha256-nhOupZpHdrUYK2a2y1y238VEPVpUmJw/nEd212wyG0c=", + "owner": "Mic92", + "repo": "nix-ld", + "rev": "90316ea7ffa3336547b85b3b2827d9d4552a4a79", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nix-ld", + "type": "github" + } + }, "nix-on-droid": { "inputs": { "home-manager": "home-manager_2", @@ -626,6 +646,7 @@ "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", + "nix-ld": "nix-ld", "nix-on-droid": "nix-on-droid", "nixpkgs": "nixpkgs", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index ed60755..51572c2 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,8 @@ url = "github:nix-community/nix-on-droid/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - + nix-ld.url = "github:Mic92/nix-ld"; + nix-ld.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = @@ -40,6 +41,7 @@ nix-on-droid, nix-index-database, stylix, + nix-ld, ... }: @@ -52,6 +54,10 @@ stylix.nixosModules.stylix nix-index-database.nixosModules.nix-index { programs.nix-index-database.comma.enable = true; } + + # uni requires us to use uv for python + # RIP binary isolation lol + nix-ld.nixosModules.nix-ld ]; secureBootModules = [ diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 0dca501..d494e96 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -116,6 +116,10 @@ }; programs.fish.enable = true; + programs.nix-ld.dev.enable = true; + programs.nix-ld.libraries = [ + pkgs.stdenv.cc.cc.lib + ]; # Enable nix-command for search and flakes nix.settings.experimental-features = [