diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-12-15 22:01:35 +0000 |
|---|---|---|
| committer | Robert Schütz <github@dotlambda.de> | 2021-12-27 17:32:31 +0000 |
| commit | b5fbd8a057dbf9515969f5e5f2d34fd9c078f24d (patch) | |
| tree | 3b1217ffcd52f9d3ecc30e641e85fd0f36d6ce45 | |
| parent | ae39fad8d0845b37396e566910fcc7b5424522b6 (diff) | |
| download | nixpkgs-b5fbd8a057dbf9515969f5e5f2d34fd9c078f24d.tar nixpkgs-b5fbd8a057dbf9515969f5e5f2d34fd9c078f24d.tar.gz nixpkgs-b5fbd8a057dbf9515969f5e5f2d34fd9c078f24d.tar.bz2 nixpkgs-b5fbd8a057dbf9515969f5e5f2d34fd9c078f24d.tar.lz nixpkgs-b5fbd8a057dbf9515969f5e5f2d34fd9c078f24d.tar.xz nixpkgs-b5fbd8a057dbf9515969f5e5f2d34fd9c078f24d.tar.zst nixpkgs-b5fbd8a057dbf9515969f5e5f2d34fd9c078f24d.zip | |
lirc: fix build against pyyaml-6.0
Without the change `lirc` build fails as:
```
$ nix build -f. -L lirc
...
PYTHONPATH=../python-pkg/lirc \
/nix/store/gn4gyzv93izh3lg5iqjb7l04k9r4hxv0-python3-3.9.9-env/bin/python ./data2hwdb ../configs ../configs \
> lirc.hwdb
Traceback (most recent call last):
File "/build/lirc-0.10.1/doc/./data2hwdb", line 112, in <module>
main()
File "/build/lirc-0.10.1/doc/./data2hwdb", line 100, in main
db = database.Database(configdir, yamldir)
File "/build/lirc-0.10.1/python-pkg/lirc/database.py", line 135, in __init__
cf = yaml.load(f.read())
TypeError: load() missing 1 required positional argument: 'Loader'
make[2]: *** [Makefile:1263: lirc.hwdb] Error 1
```
| -rw-r--r-- | pkgs/development/libraries/lirc/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 6ba5517c028..d5f84455f83 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { Makefile.in sed -i 's,PYTHONPATH=,PYTHONPATH=$(PYTHONPATH):,' \ doc/Makefile.in + + # Pull fix for new pyyaml pending upstream inclusion + # https://sourceforge.net/p/lirc/git/merge-requests/39/ + substituteInPlace python-pkg/lirc/database.py --replace 'yaml.load(' 'yaml.safe_load(' ''; preConfigure = '' |