From 21a9bf2d0c510e376166139be899645c1df0f9d0 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 5 Jan 2022 22:31:42 -0500 Subject: [PATCH] fix store path duplication issue --- flake.nix | 5 ++++- modules/profiles/desktop.nix | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 8445122..a359bfb 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,10 @@ nixosModule = { imports = builtins.attrValues self.nixosModules; - nixpkgs.overlays = [ (_: mypkgs) ]; + nixpkgs.overlays = [ + (_: _: { nixpkgs_src = toString nixpkgs; }) + (_: mypkgs) + ]; }; nixosConfigurations = import ./hosts nixpkgs hardware self.nixosModule; diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 84a0a4e..6bd9133 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -10,7 +10,7 @@ with lib; fonts.fonts = [ pkgs.bck-nerdfont ]; - environment.etc.nixpkgs.source = pkgs.path; + environment.etc.nixpkgs.source = pkgs.nixpkgs_src; nix.nixPath = [ "nixpkgs=/etc/nixpkgs" ]; environment.systemPackages = with pkgs; [ @@ -30,7 +30,7 @@ with lib; tdesktop youtube-dl - (writeShellScriptBin "nr" "nix repl ${pkgs.path}") + (writeShellScriptBin "nr" "exec nix repl ${pkgs.nixpkgs_src}") (mpv-with-scripts.override { scripts = [ mpvScripts.mpris ]; })