From a6d39ee9dba0ec547062b00d7ff5ea7fc569b17e Mon Sep 17 00:00:00 2001 From: Evan Hanson Date: Sat, 12 Jan 2019 10:33:56 +1300 Subject: [PATCH] ugarit: fix build by using CHICKEN 4.x Ugarit only works with CHICKEN 4, not CHICKEN 5 (which is the default version in nixpkgs since 69ef0702), so use the compiler and egg tools from `chickenPackages_4` for ugarit and ugarit-manifest-maker. --- pkgs/top-level/all-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb1fa5e5ebc..0e63eb9b696 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6502,9 +6502,13 @@ in xxkb = callPackage ../applications/misc/xxkb { }; - ugarit = callPackage ../tools/backup/ugarit { }; + ugarit = callPackage ../tools/backup/ugarit { + inherit (chickenPackages_4) eggDerivation fetchegg; + }; - ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker { }; + ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker { + inherit (chickenPackages_4) eggDerivation fetchegg; + }; unar = callPackage ../tools/archivers/unar { stdenv = clangStdenv; };