summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroxalica <oxalicc@pm.me>2021-05-30 22:59:40 +0800
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-06-01 00:13:53 +0000
commitb35b0a5f041cc00e2d38980166e1325585b90e0f (patch)
treef162ae193e8e9275bf547d6cc627bb3f45d33390
parentMerge branch 'release-21.05' into staging-21.05 (diff)
downloadnixpkgs-b35b0a5f041cc00e2d38980166e1325585b90e0f.tar.gz
kbd: patch paths to decompressors
(cherry picked from commit 449132738dc3128f664772f571ae2f39a17b39ab)
-rw-r--r--pkgs/os-specific/linux/kbd/default.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index 467de4b029a9..f362745e8d14 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -8,6 +8,10 @@
, check
, pam
, coreutils
+, gzip
+, bzip2
+, xz
+, zstd
}:
stdenv.mkDerivation rec {
@@ -38,6 +42,13 @@ stdenv.mkDerivation rec {
mv fgGIod/trf{,-fgGIod}.map
mv colemak/{en-latin9,colemak}.map
popd
+
+ # Fix paths to decompressors. Trailing space to avoid replacing `xz` in `".xz"`.
+ substituteInPlace src/libkbdfile/kbdfile.c \
+ --replace 'gzip ' '${gzip}/bin/gzip ' \
+ --replace 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \
+ --replace 'xz ' '${xz.bin}/bin/xz ' \
+ --replace 'zstd ' '${zstd.bin}/bin/zstd '
'';
postInstall = ''