summaryrefslogtreecommitdiffstats
path: root/pkgs/misc/urbit
diff options
context:
space:
mode:
authorJoseph Lukasik <joseph@jgl.me>2018-07-18 23:27:22 -0700
committerRobin Gloster <mail@glob.in>2018-08-05 20:34:24 +0200
commit4a044699ae92a5f86d992825b4d60665948c85ea (patch)
tree2a3229033c974ea16e8ee24505f2542015e24e7f /pkgs/misc/urbit
parent4082e94b5c1028986d80a392c5a4a9ccae3eab4c (diff)
urbit: 0.4.5 -> 0.6.0
Following https://urbit.org/docs/using/install/
Diffstat (limited to 'pkgs/misc/urbit')
-rw-r--r--pkgs/misc/urbit/default.nix30
1 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix
index df13c15562dd..41b5b3b92e6d 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/pkgs/misc/urbit/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, fetchFromGitHub, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel,
- cmake, re2c, libtool, ncurses, perl, zlib, python2, curl }:
+{ autoconf, automake, cmake, curl, fetchFromGitHub, gcc, git, gmp, libsigsegv,
+ libtool, meson, ncurses, ninja, openssl, pkgconfig, python2, ragel, re2c,
+ stdenv, zlib }:
stdenv.mkDerivation rec {
name = "urbit-${version}";
- version = "0.4.5";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "urbit";
repo = "urbit";
- rev = "v${version}";
- sha256 = "1zgxgqbz74nsgfyrvsnjj6xxpb64mrnby7bb5qy733sy04gmzgik";
+ rev = "urbit-${version}";
+ sha256 = "158mz6c6y5z1b6piid8hvrl5mcqh8q1ny185gz51jayia51azmgs";
+ fetchSubmodules = true;
};
buildInputs = with stdenv.lib; [
- gcc gmp libsigsegv openssl automake autoconf ragel cmake re2c libtool
- ncurses perl zlib python2 curl
+ autoconf automake cmake curl gcc git gmp libsigsegv libtool
+ meson ncurses ninja openssl pkgconfig python2 ragel re2c zlib
];
# uses 'readdir_r' deprecated by glibc 2.24
@@ -24,12 +26,16 @@ stdenv.mkDerivation rec {
:
'';
+ postPatch = ''
+ patchShebangs .
+ substituteInPlace scripts/build --replace 'meson .' 'meson --prefix $out .'
+ '';
+
buildPhase = ''
- sed -i 's/-lcurses/-lncurses/' Makefile
- mkdir -p $out
- cp -r . $out/
- cd $out
- make
+ git init .
+ ./scripts/bootstrap
+ ./scripts/build
+ ninja -C ./build/ install
'';
installPhase = ''