From 26875910cb53541f0ae66babcf7b2c44b37a2ee5 Mon Sep 17 00:00:00 2001
From: Joseph Lukasik <joseph@jgl.me>
Date: Thu, 26 Jul 2018 13:01:26 -0700
Subject: urbit: Don't use bootstrap scripts, no buildPhase

Incorporating feedback from https://github.com/nixos/nixpkgs/pull/43799

Also cleaned up some cruft from previous versions that didn't build with Meson/Ninja.
---
 pkgs/misc/urbit/default.nix | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'pkgs/misc/urbit')

diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix
index 41b5b3b92e6d2..4fa622727241c 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/pkgs/misc/urbit/default.nix
@@ -1,6 +1,5 @@
-{ autoconf, automake, cmake, curl, fetchFromGitHub, gcc, git, gmp, libsigsegv,
-  libtool, meson, ncurses, ninja, openssl, pkgconfig, python2, ragel, re2c,
-  stdenv, zlib }:
+{ curl, fetchFromGitHub, gcc, git, gmp, libsigsegv, meson, ncurses, ninja,
+  openssl, pkgconfig, re2c, stdenv, zlib }:
 
 stdenv.mkDerivation rec {
   name = "urbit-${version}";
@@ -14,33 +13,22 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [ pkgconfig ninja meson ];
+
   buildInputs = with stdenv.lib; [
-    autoconf automake cmake curl gcc git gmp libsigsegv libtool
-    meson ncurses ninja openssl pkgconfig python2 ragel re2c zlib
+    curl gcc git gmp libsigsegv ncurses openssl re2c zlib
   ];
 
   # uses 'readdir_r' deprecated by glibc 2.24
   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
 
-  configurePhase = ''
-    :
-  '';
-
   postPatch = ''
     patchShebangs .
-    substituteInPlace scripts/build --replace 'meson .' 'meson --prefix $out .'
   '';
 
-  buildPhase = ''
-    git init .
-    ./scripts/bootstrap
-    ./scripts/build
-    ninja -C ./build/ install
-  '';
-
-  installPhase = ''
-    :
-  '';
+  mesonFlags = [
+    "--buildtype=release"
+  ];
 
   meta = with stdenv.lib; {
     description = "An operating function";
-- 
cgit 1.4.1