diff --git a/Makefile b/Makefile index 2c047ed297..2d64b5dccf 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,13 @@ PKGS = minima extrema rusthello prog ################################################################################ -.PHONY: build all install release test clean +.PHONY: build build-all install release test clean build: - nix-build --no-out-link + nix-build -A urbit -A urb --no-out-link -all: build release test +build-all: + nix-build --no-out-link install: nix-env -f . -iA urbit -iA urbit-debug -iA urb diff --git a/nix/deps/secp256k1/builder.sh b/nix/deps/secp256k1/builder.sh index 703164c6c1..9e5a114152 100644 --- a/nix/deps/secp256k1/builder.sh +++ b/nix/deps/secp256k1/builder.sh @@ -5,7 +5,7 @@ chmod -R u+w ./src cd src libtoolize -./autogen.sh -./configure --prefix=$out --host=$host $configureFlags +bash ./autogen.sh +bash ./configure --prefix=$out --host=$host $configureFlags make make install diff --git a/nix/deps/uv/builder.sh b/nix/deps/uv/builder.sh index 2d6f324391..d9f0ff42c0 100644 --- a/nix/deps/uv/builder.sh +++ b/nix/deps/uv/builder.sh @@ -5,5 +5,5 @@ chmod -R a+w ./src cd ./src LIBTOOLIZE=libtoolize ./autogen.sh -./configure --prefix=$out --host=$host $configureFlags +bash ./configure --prefix=$out --host=$host $configureFlags make install diff --git a/nix/pkgs/arvo/builder.sh b/nix/pkgs/arvo/builder.sh index 31933a29ed..3a0c49ad29 100644 --- a/nix/pkgs/arvo/builder.sh +++ b/nix/pkgs/arvo/builder.sh @@ -1,3 +1,4 @@ source $stdenv/setup -cp -r $src $out +cp -r $src/ $out +chmod -R u+w $out diff --git a/nix/pkgs/ent/builder.sh b/nix/pkgs/ent/builder.sh index f1c558dd08..464f62e0ba 100644 --- a/nix/pkgs/ent/builder.sh +++ b/nix/pkgs/ent/builder.sh @@ -4,5 +4,5 @@ cp -r $src ./src chmod -R u+w ./src cd ./src -./configure +bash ./configure PREFIX=$out make install diff --git a/nix/pkgs/urbit/builder.sh b/nix/pkgs/urbit/builder.sh index 0f2d99d628..3b9ee115e4 100644 --- a/nix/pkgs/urbit/builder.sh +++ b/nix/pkgs/urbit/builder.sh @@ -4,7 +4,7 @@ cp -r $src ./src chmod -R u+w ./src cd src -./configure +bash ./configure make urbit urbit-worker -j8 diff --git a/nix/pkgs/urbit/release.sh b/nix/pkgs/urbit/release.sh index adef458786..9983c2831e 100644 --- a/nix/pkgs/urbit/release.sh +++ b/nix/pkgs/urbit/release.sh @@ -12,7 +12,7 @@ done CC=$host-gcc \ PKG_CONFIG=pkg-config-cross \ HOST=$host \ -./configure +bash ./configure make urbit urbit-worker -j8