refactor: nix-ld -> nix-ld-rs

khaneliman · Dec 7, 2023 · 7160b42 · 7160b42
1 parent a08e842
commit 7160b42
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 41 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -122,8 +122,8 @@
     };
 
     # Run unpatched dynamically compiled binaries
-    nix-ld = {
-      url = "github:Mic92/nix-ld";
+    nix-ld-rs = {
+      url = "github:nix-community/nix-ld-rs";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -177,7 +177,7 @@
 
   outputs = inputs:
     let
-      inherit (inputs) deploy-rs flake lanzaboote nur nix-ld rustup-overlay snowfall-lib snowfall-frost sops-nix;
+      inherit (inputs) deploy-rs flake lanzaboote nur nix-ld-rs rustup-overlay snowfall-lib snowfall-frost sops-nix;
 
       lib = snowfall-lib.mkLib {
         inherit inputs;
@@ -200,6 +200,7 @@
       overlays = [
         flake.overlays.default
         # nixpkgs-wayland.overlay
+        nix-ld-rs.overlays.default
         nur.overlay
         rustup-overlay.overlays.default
         snowfall-frost.overlays.default
@@ -216,7 +217,7 @@
 
           nixos = [
             lanzaboote.nixosModules.lanzaboote
-            nix-ld.nixosModules.nix-ld
+            # nix-ld.nixosModules.nix-ld
             sops-nix.nixosModules.sops
           ];
         };

diff --git a/modules/nixos/tools/nix-ld/default.nix b/modules/nixos/tools/nix-ld/default.nix
@@ -18,6 +18,7 @@ in
   config = mkIf cfg.enable {
     programs.nix-ld = {
       enable = true;
+      package = pkgs.nix-ld-rs;
 
       libraries = with pkgs; [
         gcc