diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-07 00:01:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-07 00:01:58 +0000 |
| commit | bb21178e5c5cb0580df6f96ccef4324e629f3811 (patch) | |
| tree | 5772d60815c5688040e0fcd4f54d98a16e26972e /pkgs/development/ruby-modules | |
| parent | 191e60634e626a779fa3d42931f2f9688f695fa2 (diff) | |
| parent | 48fecd04896121f8af12ff33754ef251d4ae6318 (diff) | |
| download | nixlib-bb21178e5c5cb0580df6f96ccef4324e629f3811.tar nixlib-bb21178e5c5cb0580df6f96ccef4324e629f3811.tar.gz nixlib-bb21178e5c5cb0580df6f96ccef4324e629f3811.tar.bz2 nixlib-bb21178e5c5cb0580df6f96ccef4324e629f3811.tar.lz nixlib-bb21178e5c5cb0580df6f96ccef4324e629f3811.tar.xz nixlib-bb21178e5c5cb0580df6f96ccef4324e629f3811.tar.zst nixlib-bb21178e5c5cb0580df6f96ccef4324e629f3811.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 85af181698cf..029329723fc0 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -25,7 +25,7 @@ , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk -, bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie +, bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml , autoSignDarwinBinariesHook, fetchpatch }@args: @@ -711,6 +711,16 @@ in buildFlags = [ "--disable-lto" ]; }); + sass-embedded = attrs: { + # Patch the Rakefile to use our dart-sass and not try to fetch anything. + dontBuild = false; + postPatch = '' + substituteInPlace ext/sass/Rakefile \ + --replace \'dart-sass/sass\' \'${dart-sass}/bin/sass\' \ + --replace ' => %w[dart-sass]' "" + ''; + }; + scrypt = attrs: lib.optionalAttrs stdenv.isDarwin { dontBuild = false; postPatch = '' |