From 106d377299c177baa0fb15e3b0f11514539cb730 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan <y.bera003.06@protonmail.com> Date: Wed, 2 Dec 2020 23:16:00 +0300 Subject: [PATCH] nix: envrc-common doesn't work apparently, so copy contents in it to both envrc-nvidia and envrc --- nix/envrc | 5 ++++- nix/envrc-common | 4 ---- nix/envrc-nvidia | 5 ++++- 3 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 nix/envrc-common diff --git a/nix/envrc b/nix/envrc index fe397bdd79..0d450b32fe 100644 --- a/nix/envrc +++ b/nix/envrc @@ -1,2 +1,5 @@ -source_env nix/envrc-common +watch_file nix/shell.nix +watch_file nix/common.nix +watch_file nix/sources.nix +watch_file nix/sources.json use nix nix/shell.nix diff --git a/nix/envrc-common b/nix/envrc-common deleted file mode 100644 index 55aa08fc91..0000000000 --- a/nix/envrc-common +++ /dev/null @@ -1,4 +0,0 @@ -watch_file nix/shell.nix -watch_file nix/common.nix -watch_file nix/sources.nix -watch_file nix/sources.json diff --git a/nix/envrc-nvidia b/nix/envrc-nvidia index a6f67b16d2..5fcdbc823b 100644 --- a/nix/envrc-nvidia +++ b/nix/envrc-nvidia @@ -1,2 +1,5 @@ -source_env nix/envrc-common +watch_file nix/shell.nix +watch_file nix/common.nix +watch_file nix/sources.nix +watch_file nix/sources.json use nix nix/shell.nix --arg nvidia true