tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

wyrd: fix build

(cherry picked from commit 1d4bbef0e88a066521ec4fef1e64220149fcadca)

authored by

Vincent Laporte and committed by
Will Dietz bd6d6078 f394f523

+8 -9
+7 -4
pkgs/tools/misc/wyrd/default.nix
··· 1 - { stdenv, fetchurl, ocaml, ncurses, remind, camlp4 }: 1 + { stdenv, fetchurl, ocamlPackages, ncurses, remind }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 version = "1.4.6"; ··· 9 9 sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj"; 10 10 }; 11 11 12 - buildInputs = [ ocaml ncurses remind camlp4 ]; 12 + NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; 13 13 14 - # needed for configure phase to succeed 15 - CPPFLAGS = "-DNCURSES_INTERNALS"; 14 + preConfigure = '' 15 + substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC" 16 + ''; 17 + 18 + buildInputs = [ ocamlPackages.ocaml ncurses remind ocamlPackages.camlp4 ]; 16 19 17 20 preferLocalBuild = true; 18 21
+1 -1
pkgs/top-level/all-packages.nix
··· 5505 5505 5506 5506 wv2 = callPackage ../tools/misc/wv2 { }; 5507 5507 5508 - inherit (ocamlPackages) wyrd; 5508 + wyrd = callPackage ../tools/misc/wyrd { }; 5509 5509 5510 5510 x86info = callPackage ../os-specific/linux/x86info { }; 5511 5511
-4
pkgs/top-level/ocaml-packages.nix
··· 955 955 956 956 # Apps / from all-packages 957 957 958 - wyrd = callPackage ../tools/misc/wyrd { 959 - ncurses = pkgs.ncurses5; 960 - }; 961 - 962 958 haxe = callPackage ../development/compilers/haxe { }; 963 959 964 960 ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { };