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

Fix wyrd to compile with ocaml 4.02

Browse Source 
camlp4 is now a separate package instead of shipping within the ocaml package
This commit is contained in:
Samuel Rivas 2015-07-18 11:06:59 +02:00 committed by Vincent Laporte
parent dc5084b4d1
commit 55ad2d2150
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, ncurses, remind }: { stdenv, fetchurl, ocaml, ncurses, remind, camlp4 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.4.6"; version = "1.4.6";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj"; sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj";
}; };
buildInputs = [ ocaml ncurses remind ]; buildInputs = [ ocaml ncurses remind camlp4 ];
preferLocalBuild = true; preferLocalBuild = true;

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

@ -3440,7 +3440,9 @@ let
wv2 = callPackage ../tools/misc/wv2 { }; wv2 = callPackage ../tools/misc/wv2 { };
wyrd = callPackage ../tools/misc/wyrd { }; wyrd = callPackage ../tools/misc/wyrd {
inherit (ocamlPackages) camlp4;
};
x86info = callPackage ../os-specific/linux/x86info { }; x86info = callPackage ../os-specific/linux/x86info { };