From 46a438f26eab547563786c887621a3f50c908eef Mon Sep 17 00:00:00 2001 From: Jared Tobin Date: Thu, 30 Jan 2020 11:14:30 +0400 Subject: [PATCH] build: use generic builder in urbit derivation 'installPhase' captures all the important stuff that builder.sh previously did, and use of the generic builder allows stages of the build to be more easily overridden. --- nix/pkgs/urbit/builder.sh | 15 --------------- nix/pkgs/urbit/default.nix | 10 +++++++++- 2 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 nix/pkgs/urbit/builder.sh diff --git a/nix/pkgs/urbit/builder.sh b/nix/pkgs/urbit/builder.sh deleted file mode 100644 index 3bd7155383..0000000000 --- a/nix/pkgs/urbit/builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -source $stdenv/setup - -cp -r $src ./src -chmod -R u+w ./src -cd src - -bash ./configure - -make clean -make all -j8 -make test - -mkdir -p $out/bin -cp ./build/urbit $out/bin/$exename -cp ./build/urbit-worker $out/bin/$exename-worker diff --git a/nix/pkgs/urbit/default.nix b/nix/pkgs/urbit/default.nix index 2617f9afca..328b17f55e 100644 --- a/nix/pkgs/urbit/default.nix +++ b/nix/pkgs/urbit/default.nix @@ -27,9 +27,17 @@ let inherit name meta; exename = name; src = ../../../pkg/urbit; - builder = ./builder.sh; nativeBuildInputs = deps ++ vendor; + installPhase = '' + make all -j8 + make test + + mkdir -p $out/bin + cp ./build/urbit $out/bin/$exename + cp ./build/urbit-worker $out/bin/$exename-worker + ''; + # See https://github.com/NixOS/nixpkgs/issues/18995 hardeningDisable = if debug then [ "all" ] else [];