pyrox.dev
lol
input-remapper: 1.4.2 -> 1.5.0 (#191967)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
+18
-19
+18
-19
pkgs/tools/inputmethods/input-remapper/default.nix
+18
-19
pkgs/tools/inputmethods/input-remapper/default.nix
···
29
29
# failures when building. Override this to true to run tests anyway
30
30
# See upstream issue: https://github.com/sezanzeb/input-remapper/issues/306
31
31
, withDoCheck ? false
32
-
# Version and rev and hash are package arguments to allow overriding
33
-
# while ensuring the values in prePatch and src match
34
-
# https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7
35
-
# The names are prefixed with input_remapper to avoid potential
36
-
# collisions with package names
37
-
, input_remapper_version ? "1.4.2"
38
-
, input_remapper_src_rev ? "af20f87a1298153e765b840a2164ba63b9ef937a"
39
-
, input_remapper_src_hash ? "sha256-eG4Fx1z74Bq1HrfmzOuULQLziGdWnHLax8y2dymjWsI="
40
32
}:
41
33
42
34
let
43
35
maybeXmodmap = lib.optional withXmodmap xmodmap;
44
36
in
45
-
buildPythonApplication {
37
+
(buildPythonApplication {
46
38
pname = "input-remapper";
47
-
version = input_remapper_version;
39
+
version = "1.5.0";
48
40
49
41
src = fetchFromGitHub {
50
-
rev = input_remapper_src_rev;
42
+
rev = "e31a1b2bc5d23fe13130afcc242063196335399f";
51
43
owner = "sezanzeb";
52
44
repo = "input-remapper";
53
-
hash = input_remapper_src_hash;
45
+
hash = "sha256-KPQLgXSonuOgphagYN2JN+CMIpmjTIPUTCqOPDk0UYU=";
54
46
};
55
47
56
48
# Fixes error
···
58
50
# at startup, see https://github.com/NixOS/nixpkgs/issues/56943
59
51
strictDeps = false;
60
52
61
-
prePatch = ''
62
-
# set revision for --version output
63
-
echo "COMMIT_HASH = '${input_remapper_src_rev}'" > inputremapper/commit_hash.py
64
-
53
+
postPatch = ''
65
54
# fix FHS paths
66
55
substituteInPlace inputremapper/configs/data.py \
67
56
--replace "/usr/share/input-remapper" "$out/usr/share/input-remapper"
68
-
'' + (lib.optionalString (withDebugLogLevel) ''
57
+
'' + lib.optionalString withDebugLogLevel ''
69
58
# if debugging
70
59
substituteInPlace inputremapper/logger.py --replace "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)"
71
-
'');
60
+
'';
72
61
73
62
doCheck = withDoCheck;
74
63
checkInputs = [
···
161
150
maintainers = with maintainers; [ LunNova ];
162
151
mainProgram = "input-remapper-gtk";
163
152
};
164
-
}
153
+
}).overrideAttrs (final: prev: {
154
+
# Set in an override as buildPythonApplication doesn't yet support
155
+
# the `final:` arg yet from #119942 'overlay style overridable recursive attributes'
156
+
# this ensures the rev matches the input src's rev after overriding
157
+
# See https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7 for more
158
+
# discussion
159
+
postPatch = prev.postPatch or "" + ''
160
+
# set revision for --version output
161
+
echo "COMMIT_HASH = '${final.src.rev}'" > inputremapper/commit_hash.py
162
+
'';
163
+
})