From 5c0a4012c304d44f80f6af5da9539594f949ddda Mon Sep 17 00:00:00 2001
From: Grigory Shipunov
Date: Mon, 24 Jul 2023 00:09:31 +0200
Subject: fix nix_ld

---
 modules/basic-tools/default.nix | 10 +---------
 modules/basic-tools/nix-ld.nix  | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 modules/basic-tools/nix-ld.nix

(limited to 'modules')

diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix
index 4fd52ea..f7ef3c3 100644
--- a/modules/basic-tools/default.nix
+++ b/modules/basic-tools/default.nix
@@ -5,6 +5,7 @@
     ./fzf.nix
     ./multiplexers.nix
     ./nix.nix
+    ./nix-ld.nix
   ];
 
   environment.systemPackages = with pkgs; [
@@ -97,15 +98,6 @@
     '';
   };
 
-  programs.nix-ld.enable = true;
-  environment.variables = {
-      NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
-        pkgs.stdenv.cc.cc
-      ];
-      NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
-  };
-
-
   programs.iftop.enable = true;
   programs.mosh.enable = true;
 
diff --git a/modules/basic-tools/nix-ld.nix b/modules/basic-tools/nix-ld.nix
new file mode 100644
index 0000000..2462721
--- /dev/null
+++ b/modules/basic-tools/nix-ld.nix
@@ -0,0 +1,15 @@
+{ pkgs, lib, ... }:
+{
+  programs.nix-ld ={
+  enable = true;
+  libraries = [
+  pkgs.stdenv.cc.cc
+  ];
+  };
+  #environment.variables = {
+  #    NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
+  #      pkgs.stdenv.cc.cc
+  #    ];
+  #    #NIX_LD = "$(cat ${pkgs.stdenv.cc}/nix-support/dynamic-linker";
+  #};
+}
-- 
cgit v1.3.1