b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

discourse: Remove sass-embedded patch

Browse source 
This was fixed globally in #240000 and thus is not needed here anymore.
This commit is contained in:
Marcel Müller 2023-09-13 14:49:25 +02:00
parent 48f63c5b74
commit 8e8a6ed409
2 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/servers/web-apps/discourse/default.nix
View file

@ -38,7 +38,6 @@
, fixup_yarn_lock
, nodePackages
, nodejs_16
, dart-sass-embedded
, jq
, moreutils
@ -189,20 +188,6 @@ let
cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so
'';
};
sass-embedded = gems.sass-embedded // {
dontBuild = false;
# `sass-embedded` depends on `dart-sass-embedded` and tries to
# fetch that as `.tar.gz` from GitHub releases. That `.tar.gz`
# can also be specified via `SASS_EMBEDDED`. But instead of
# compressing our `dart-sass-embedded` just to decompress it
# again, we simply patch the Rakefile to symlink that path.
patches = [
./rubyEnv/sass-embedded-static.patch
];
postPatch = ''
export SASS_EMBEDDED=${dart-sass-embedded}/bin
'';
};
};
groups = [

21
pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch
View file

@ -1,21 +0,0 @@
diff --git a/ext/sass/Rakefile b/ext/sass/Rakefile
index 4ca11d4f82ea..c0450ad6f8f3 100644
--- a/ext/sass/Rakefile
+++ b/ext/sass/Rakefile
@@ -18,15 +18,7 @@ file 'protoc.exe' do |t|
end
file 'dart-sass' do |t|
- raise if ENV.key?('DART_SASS')
-
- gem_install 'sass-embedded', SassConfig.gem_version, SassConfig.gem_platform do |dir|
- cp_r File.absolute_path("ext/sass/#{t.name}", dir), t.name
- end
-rescue StandardError
- archive = fetch(ENV.fetch('DART_SASS') { SassConfig.default_dart_sass })
- unarchive archive
- rm archive
+ symlink(ENV.fetch('DART_SASS'), t.name)
end
file 'cli.rb' => %w[dart-sass] do |t|