From 099df1f9acb776b45f91570a3d7de642aacd7993 Mon Sep 17 00:00:00 2001 From: Stanisław Pitucha Date: Thu, 1 Sep 2022 14:55:06 +1000 Subject: v8: fix darwin build --- pkgs/development/ruby-modules/gem-config/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/development/ruby-modules') diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 5a6d885159a5..18435b3b42e3 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -361,6 +361,12 @@ in buildInputs = [ which v8 python2 ]; buildFlags = [ "--with-system-v8=true" ]; dontBuild = false; + # The gem includes broken symlinks which are ignored during unpacking, but + # then fail during build. Since the content is missing anyway, touching the + # files is enough to unblock the build. + preBuild = '' + touch vendor/depot_tools/cbuildbot vendor/depot_tools/chrome_set_ver vendor/depot_tools/cros_sdk + ''; postPatch = '' substituteInPlace ext/libv8/extconf.rb \ --replace "location = Libv8::Location::Vendor.new" \ -- cgit 1.4.1 From 3e2341b08267da2826093652c3e45bf2140ddb7a Mon Sep 17 00:00:00 2001 From: Stanisław Pitucha Date: Sun, 11 Sep 2022 12:49:42 +1000 Subject: rubyPackages.sqlite3: fix building for >= 1.5.0 --- pkgs/development/ruby-modules/gem-config/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'pkgs/development/ruby-modules') diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 18435b3b42e3..c266319fa345 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -639,7 +639,16 @@ in buildInputs = [ args.snappy ]; }; - sqlite3 = attrs: { + sqlite3 = attrs: if lib.versionAtLeast attrs.version "1.5.0" + then { + nativeBuildInputs = [ pkg-config sqlite.dev ]; + buildInputs = [ sqlite.out ]; + buildFlags = [ + "--enable-system-libraries" + "--with-pkg-config=${pkg-config}/bin/pkg-config" + ]; + } + else { buildFlags = [ "--with-sqlite3-include=${sqlite.dev}/include" "--with-sqlite3-lib=${sqlite.out}/lib" -- cgit 1.4.1