diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
| commit | 00df25ee57fcc2227ffdbbff2280b13d898bfd7d (patch) | |
| tree | a2cdc854489799c6d7900b0e5ac215b7b95d762a /pkgs/servers/x11 | |
| parent | 580cab57e4f188d25144e398d7b8e3d5085299a9 (diff) | |
| parent | bb3f7d14a17e88e4341872c55d8b32127c6f8101 (diff) | |
| download | nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.gz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.bz2 nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.lz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.xz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.zst nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.zip | |
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
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 |