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

wyrd: fix build

Browse Source
This commit is contained in:
Vincent Laporte 2018-03-07 16:52:35 +00:00 committed by Will Dietz
parent f2661ed72b
commit 1d4bbef0e8
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/misc/wyrd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, ncurses, remind, camlp4 }: { stdenv, fetchurl, ocamlPackages, ncurses, remind }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.4.6"; version = "1.4.6";
@ -9,10 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj"; sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj";
}; };
buildInputs = [ ocaml ncurses remind camlp4 ]; NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ];
# needed for configure phase to succeed preConfigure = ''
CPPFLAGS = "-DNCURSES_INTERNALS"; substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC"
'';
buildInputs = [ ocamlPackages.ocaml ncurses remind ocamlPackages.camlp4 ];
preferLocalBuild = true; preferLocalBuild = true;

2
pkgs/top-level/all-packages.nix
View File

@ -5505,7 +5505,7 @@ with pkgs;
wv2 = callPackage ../tools/misc/wv2 { }; wv2 = callPackage ../tools/misc/wv2 { };
inherit (ocamlPackages) wyrd; wyrd = callPackage ../tools/misc/wyrd { };
x86info = callPackage ../os-specific/linux/x86info { }; x86info = callPackage ../os-specific/linux/x86info { };

4
pkgs/top-level/ocaml-packages.nix
View File

@ -969,10 +969,6 @@ let
# Apps / from all-packages # Apps / from all-packages
wyrd = callPackage ../tools/misc/wyrd {
ncurses = pkgs.ncurses5;
};
haxe = callPackage ../development/compilers/haxe { }; haxe = callPackage ../development/compilers/haxe { };
ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { };