Skip to content

Commit

Permalink
discourse: Remove sass-embedded patch
Browse files Browse the repository at this point in the history
This was fixed globally in NixOS#240000 and thus is not needed here anymore.

# Conflicts:
#	pkgs/servers/web-apps/discourse/default.nix
  • Loading branch information
TheNeikos authored and pdg137 committed Oct 21, 2023
1 parent 020bb0c commit 5a86f5a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 36 deletions.
17 changes: 2 additions & 15 deletions pkgs/servers/web-apps/discourse/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
, fixup_yarn_lock
, nodePackages
, nodejs_16
, dart-sass-embedded
, jq
, moreutils

, plugins ? []
}@args:
Expand Down Expand Up @@ -187,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 = [
Expand Down
21 changes: 0 additions & 21 deletions pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch

This file was deleted.

0 comments on commit 5a86f5a

Please sign in to comment.