From 8e8a6ed409ea6333e7f408de89377fc98e930c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Wed, 13 Sep 2023 14:49:25 +0200 Subject: [PATCH] discourse: Remove sass-embedded patch This was fixed globally in #240000 and thus is not needed here anymore. --- pkgs/servers/web-apps/discourse/default.nix | 15 ------------- .../rubyEnv/sass-embedded-static.patch | 21 ------------------- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 004b03563a37..b5064cd078ac 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -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 = [ diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch b/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch deleted file mode 100644 index 86c343e30fd1..000000000000 --- a/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch +++ /dev/null @@ -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|