diff options
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | nixos/utils.nix | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/default.nix b/default.nix index b138123..42dc0f0 100644 --- a/default.nix +++ b/default.nix @@ -18,7 +18,7 @@ in rec { }; utils = import ./nixos/utils.nix { pkgs = pkgs; - rootSrc = rootSrc; # FIXME: remove the need for this + src = rootSrc; baseName = "dotfiles"; }; test = utils.test [ diff --git a/nixos/utils.nix b/nixos/utils.nix index 06a7e55..6aea0dc 100644 --- a/nixos/utils.nix +++ b/nixos/utils.nix @@ -1,12 +1,11 @@ -{ pkgs, rootSrc ? pkgs.nix-gitignore.gitignoreSource [ ] ./., baseName }: +{ pkgs, src, baseName }: let nixfmt = import (builtins.fetchTarball "https://github.com/serokell/nixfmt/archive/master.tar.gz") { }; - in rec { baseTask = pkgs.stdenv.mkDerivation { name = "${baseName}-task"; - src = rootSrc; + src = src; buildInputs = [ ]; phases = "unpackPhase buildPhase"; buildPhase = '' |