public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

urbit: Don't use bootstrap scripts, no buildPhase

Browse Source 
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.
This commit is contained in:
Joseph Lukasik 2018-07-26 13:01:26 -07:00 committed by Robin Gloster
parent 4a044699ae
commit 26875910cb
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/misc/urbit/default.nix
View File

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