diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
| commit | ded9a4b1aa68b8645271a63e9543ef56177ae642 (patch) | |
| tree | d351102a17ab05c6e263e970f43ab3b30561112e /pkgs/servers/x11 | |
| parent | 98df4f635136e63644cb0ab646b55d60cbb444a4 (diff) | |
| parent | 5b0398dc36ce5746d8d54e04a1dfcab25939484a (diff) | |
| download | nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.gz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.bz2 nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.lz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.xz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.zst nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.zip | |
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0023c2c070a5..b1a749c7ec4a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -426,6 +426,10 @@ in ''; }; + xlsfonts = attrs: attrs // { + meta = attrs.meta // { license = lib.licenses.mit; }; + }; + xorgserver = with xorg; attrs_passed: # exchange attrs if abiCompat is set let |