about summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2016-08-31T16·10-0400
committerShea Levy <shea@shealevy.com>2016-08-31T16·10-0400
commit87b189c2b326c790a35ff53a2d825c1ef48f644e (patch)
tree597027ba3271bccecf659e1c8d7ef487b14da2d9 /.gitignore
parentdfe09386148901e4d9f2dc84641d2d5544c886f7 (diff)
parent821380c77bbfeb945d2b8a39a876c7c6ef090988 (diff)
Merge branch 'nix-build-c++'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index c9e3969969..04dd791964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,6 @@ Makefile.config
 /scripts/nix-switch
 /scripts/nix-collect-garbage
 /scripts/nix-prefetch-url
-/scripts/nix-build
 /scripts/nix-copy-closure
 /scripts/NixConfig.pm
 /scripts/NixManifest.pm
@@ -80,6 +79,9 @@ Makefile.config
 # /src/buildenv/
 /src/buildenv/buildenv
 
+# /src/nix-build/
+/src/nix-build/nix-build
+
 # /tests/
 /tests/test-tmp
 /tests/common.sh