Fixed Nix build errors on Bernardo's Ubuntu. (#1220)

This commit is contained in:
benjamin-tlon 2019-03-06 11:57:31 -08:00 committed by GitHub
parent 89e789aadb
commit 4024cdb739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 10 deletions

View File

@ -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: 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: install:
nix-env -f . -iA urbit -iA urbit-debug -iA urb nix-env -f . -iA urbit -iA urbit-debug -iA urb

View File

@ -5,7 +5,7 @@ chmod -R u+w ./src
cd src cd src
libtoolize libtoolize
./autogen.sh bash ./autogen.sh
./configure --prefix=$out --host=$host $configureFlags bash ./configure --prefix=$out --host=$host $configureFlags
make make
make install make install

View File

@ -5,5 +5,5 @@ chmod -R a+w ./src
cd ./src cd ./src
LIBTOOLIZE=libtoolize ./autogen.sh LIBTOOLIZE=libtoolize ./autogen.sh
./configure --prefix=$out --host=$host $configureFlags bash ./configure --prefix=$out --host=$host $configureFlags
make install make install

View File

@ -1,3 +1,4 @@
source $stdenv/setup source $stdenv/setup
cp -r $src $out cp -r $src/ $out
chmod -R u+w $out

View File

@ -4,5 +4,5 @@ cp -r $src ./src
chmod -R u+w ./src chmod -R u+w ./src
cd ./src cd ./src
./configure bash ./configure
PREFIX=$out make install PREFIX=$out make install

View File

@ -4,7 +4,7 @@ cp -r $src ./src
chmod -R u+w ./src chmod -R u+w ./src
cd src cd src
./configure bash ./configure
make urbit urbit-worker -j8 make urbit urbit-worker -j8

View File

@ -12,7 +12,7 @@ done
CC=$host-gcc \ CC=$host-gcc \
PKG_CONFIG=pkg-config-cross \ PKG_CONFIG=pkg-config-cross \
HOST=$host \ HOST=$host \
./configure bash ./configure
make urbit urbit-worker -j8 make urbit urbit-worker -j8