From eaf0b5e595ff0aac314db5f524bfc49f6f45555c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 29 Jan 2019 20:30:56 +0000 Subject: [PATCH] defaultGemConfig.tzinfo: fix for >=2.0 (#54881) --- .../ruby-modules/gem-config/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 687abc4e0fcb..ceb0985cdd70 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -425,10 +425,16 @@ in tzinfo = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { dontBuild = false; - postPatch = '' - substituteInPlace lib/tzinfo/zoneinfo_data_source.rb \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - ''; + postPatch = + let + path = if lib.versionAtLeast attrs.version "2.0" + then "lib/tzinfo/data_sources/zoneinfo_data_source.rb" + else "lib/tzinfo/zoneinfo_data_source.rb"; + in + '' + substituteInPlace ${path} \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; }; uuid4r = attrs: {