diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2022-09-12 19:49:24 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2022-09-12 19:49:24 +0200 |
| commit | 3086301ac4274dc8b58b2e03a5a7f4600bb58160 (patch) | |
| tree | d2319d57bd228b4bae1f6ba29737cce972ef947d /pkgs/development/ruby-modules | |
| parent | 2e85da905bcaaf8acae98fb04bba7f1a548b1540 (diff) | |
| parent | 9eeed94d3e3b93d071528f53962dfffbc9758337 (diff) | |
| download | nixlib-3086301ac4274dc8b58b2e03a5a7f4600bb58160.tar nixlib-3086301ac4274dc8b58b2e03a5a7f4600bb58160.tar.gz nixlib-3086301ac4274dc8b58b2e03a5a7f4600bb58160.tar.bz2 nixlib-3086301ac4274dc8b58b2e03a5a7f4600bb58160.tar.lz nixlib-3086301ac4274dc8b58b2e03a5a7f4600bb58160.tar.xz nixlib-3086301ac4274dc8b58b2e03a5a7f4600bb58160.tar.zst nixlib-3086301ac4274dc8b58b2e03a5a7f4600bb58160.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 4e935c6537a1..c4e10b7f96a5 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" \ @@ -634,7 +640,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" |