diff options
| author | Grigory Shipunov | 2023-07-24 00:09:31 +0200 |
|---|---|---|
| committer | Grigory Shipunov | 2023-07-24 00:09:31 +0200 |
| commit | 5c0a4012c304d44f80f6af5da9539594f949ddda (patch) | |
| tree | 798ea682c2bc1787fad0f970aa22a315943e4bc4 /modules | |
| parent | 5b47cc39c1d94d52a791e681fa3152754b9818cd (diff) | |
fix nix_ld
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/basic-tools/default.nix | 10 | ||||
| -rw-r--r-- | modules/basic-tools/nix-ld.nix | 15 |
2 files changed, 16 insertions, 9 deletions
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"; + #}; +} |
