summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2023-06-15 18:51:37 +0200
committerCole Helbling <cole.e.helbling@outlook.com>2023-06-15 13:40:15 -0700
commite27a1b6a2ad8a5561f9d6678432966ff073a958e (patch)
tree671d2e6fc991ab33222de079786ca93de0d810d3
parentMerge pull request #237943 from NixOS/backport-236799-to-release-23.05 (diff)
downloadnixpkgs-e27a1b6a2ad8a5561f9d6678432966ff073a958e.tar.gz
documentation-highlighter: less weird source filter
The expansion into absolute paths caused the filter to reject all the files in some unusual circumstances (we think it's due to use of a chroot store). This works reliably no matter where nixpkgs is located. (cherry picked from commit 43af5f0f66a585f7e207fafa66bfa4123d4dfc9b)
-rw-r--r--pkgs/misc/documentation-highlighter/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix
index 22ea3a5f86e3..3a7f5b21c69e 100644
--- a/pkgs/misc/documentation-highlighter/default.nix
+++ b/pkgs/misc/documentation-highlighter/default.nix
@@ -9,12 +9,12 @@ runCommand "documentation-highlighter" {
};
src = lib.sources.cleanSourceWith {
src = ./.;
- filter = path: type: lib.elem path (map toString [
- ./highlight.pack.js
- ./LICENSE
- ./loader.js
- ./mono-blue.css
- ./README.md
+ filter = path: type: lib.elem (baseNameOf path) ([
+ "highlight.pack.js"
+ "LICENSE"
+ "loader.js"
+ "mono-blue.css"
+ "README.md"
]);
};
} ''