Compare commits

...

2 Commits

Author SHA1 Message Date
c95bcb5eaf Fix m17n 2021-12-03 12:41:09 +01:00
ea517b4e74 Update nixos. 2021-12-03 12:30:13 +01:00
3 changed files with 32 additions and 4 deletions

28
148418.patch Normal file

@ -0,0 +1,28 @@
From b5b74c914e135834ee3d88c76a3db9f563ed4ca7 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
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

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1636267212,
"narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=",
"lastModified": 1638376152,
"narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35",
"rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f",
"type": "github"
},
"original": {

@ -15,7 +15,7 @@
channels.nixpkgs.input = nixpkgs;
channels.nixpkgs.patches = [ ];
channels.nixpkgs.patches = [ ./148418.patch ];
nix.generateRegistryFromInputs = true;