summary refs log tree commit diff
path: root/pkgs/servers/x11/xorg
diff options
context:
space:
mode:
authorPascal Wittmann <mail@pascal-wittmann.de>2018-08-04 16:04:51 +0200
committerPascal Wittmann <mail@pascal-wittmann.de>2018-08-04 16:04:51 +0200
commit0fa1ffd17f0f083ffe76ae23767908e82c3fe5f7 (patch)
tree53f4f5ea4e875ef60717a749d03c459781147d53 /pkgs/servers/x11/xorg
parentfd08f993f348cabc8cf70a5f2ee09173d5165313 (diff)
downloadnixlib-0fa1ffd17f0f083ffe76ae23767908e82c3fe5f7.tar
nixlib-0fa1ffd17f0f083ffe76ae23767908e82c3fe5f7.tar.gz
nixlib-0fa1ffd17f0f083ffe76ae23767908e82c3fe5f7.tar.bz2
nixlib-0fa1ffd17f0f083ffe76ae23767908e82c3fe5f7.tar.lz
nixlib-0fa1ffd17f0f083ffe76ae23767908e82c3fe5f7.tar.xz
nixlib-0fa1ffd17f0f083ffe76ae23767908e82c3fe5f7.tar.zst
nixlib-0fa1ffd17f0f083ffe76ae23767908e82c3fe5f7.zip
xlsfonts: set license in overrides
Diffstat (limited to 'pkgs/servers/x11/xorg')
-rw-r--r--pkgs/servers/x11/xorg/default.nix1
-rw-r--r--pkgs/servers/x11/xorg/overrides.nix4
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 26865ebb9426..cc28dc73ca87 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2526,7 +2526,6 @@ let
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
-    meta.license = stdenv.lib.licenses.mit;
   }) // {inherit libX11 xproto ;};
 
   xmag = (mkDerivation "xmag" {
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 2438c49d9cb9..d989d17b0325 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