fix stack --nix

diff --git a/Makefile b/Makefile
index 450c6360c7d16ca8d66b11ca28451025f5932945..836364e5460930152dc71df599c91bacb84ca4a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ DESTDIR=
 pfx = /usr/local
 flavour = $(shell if stack --version >/dev/null 2>&1; then echo stack; elif cabal --version >/dev/null 2>&1; then echo cabal; else echo simple; fi)
 parallel = $(filter -j%, $(MAKEFLAGS))
-nix = $(if $(findstring nix,$(shell bash -c "type -p stack")),--nix,)
+nix = $(if $(findstring nix,$(shell bash -c "readlink $$(type -p stack)")),--nix,)
 
 build: build-$(flavour)
 install: install-$(flavour) install-common

diff --git a/stack-12.yaml b/stack-12.yaml
index 34252b79eb06523601047c1aa36e3676c71bb149..b08fb12b90dee9a93801e389bce10aadd481e96e 100644 (file)
--- a/stack-12.yaml
+++ b/stack-12.yaml
@@ -5,3 +5,5 @@ flags: {}
 extra-package-dbs: []
 packages:
 - '.'
+nix:
+  packages: [ file ]

diff --git a/stack.yaml b/stack.yaml
index 6efed03bb545ec95c673e9f4938ebdccda790854..ae6b248747c1a6a9add67e30809758889ff00181 100644 (file)
--- a/stack.yaml
+++ b/stack.yaml
@@ -5,3 +5,5 @@ flags: {}
 extra-package-dbs: []
 packages:
 - '.'
+nix:
+  packages: [ file ]