From c95bcb5eaf597024787a4c185d2f4e287fd3e3e4 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 3 Dec 2021 12:41:09 +0100 Subject: [PATCH] Fix m17n --- 148418.patch | 28 ++++++++++++++++++++++++++++ flake.nix | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 148418.patch diff --git a/148418.patch b/148418.patch new file mode 100644 index 0000000..0e8d618 --- /dev/null +++ b/148418.patch @@ -0,0 +1,28 @@ +From b5b74c914e135834ee3d88c76a3db9f563ed4ca7 Mon Sep 17 00:00:00 2001 +From: Gabriel Ebner +Date: Fri, 3 Dec 2021 12:22:31 +0100 +Subject: [PATCH] m17n_lib: fix m17n-db support + +--- + pkgs/tools/inputmethods/m17n-lib/default.nix | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix +index 2ca60bca3e74c..cc290ab0eca94 100644 +--- a/pkgs/tools/inputmethods/m17n-lib/default.nix ++++ b/pkgs/tools/inputmethods/m17n-lib/default.nix +@@ -11,9 +11,11 @@ stdenv.mkDerivation rec { + strictDeps = true; + + # reconf needed to sucesfully cross-compile +- nativeBuildInputs = [ autoreconfHook pkg-config ]; +- +- buildInputs = [ m17n_db ]; ++ nativeBuildInputs = [ ++ autoreconfHook pkg-config ++ # requires m17n-db tool at build time ++ m17n_db ++ ]; + + # Fails parallel build due to missing intra-package depends: + # https://savannah.nongnu.org/bugs/index.php?61377 diff --git a/flake.nix b/flake.nix index 1c64e0d..e9a87c8 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ channels.nixpkgs.input = nixpkgs; - channels.nixpkgs.patches = [ ]; + channels.nixpkgs.patches = [ ./148418.patch ]; nix.generateRegistryFromInputs = true;