From a979bd9214a622ef444a20e2023d37c268c43ea4 Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Wed, 21 Dec 2022 16:30:37 +0200 Subject: fix(tzdata): prepend to ZONE_SOURCES instead of substituting in place --- pkgs/development/compilers/crystal/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs/development/compilers/crystal/default.nix') diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index ef835ff69f0..e642e8ee7bc 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -4,6 +4,7 @@ , fetchurl , fetchpatch , lib +, substituteAll # Dependencies , boehmgc , coreutils @@ -100,7 +101,12 @@ let inherit sha256; }; - patches = [ ] + patches = [ + (substituteAll { + src = ./tzdata.patch; + inherit tzdata; + }) + ] ++ lib.optionals (lib.versionOlder version "1.2.0") [ # add support for DWARF5 debuginfo, fixes builds on recent compilers # the PR is 8 commits from 2019, so just fetch the whole thing @@ -124,9 +130,6 @@ let substituteInPlace Makefile \ --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation' - substituteInPlace src/crystal/system/unix/time.cr \ - --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - mkdir -p $TMP/crystal substituteInPlace spec/std/file_spec.cr \ -- cgit 1.4.1