diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-11 13:36:42 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-11 13:36:42 +0100 |
| commit | 2b9372b2ca975cba434790eee2b75c01cad0fe02 (patch) | |
| tree | 257ce8022e4a7651a74d40f2eb27a7a97f1b651b /pkgs/servers/x11 | |
| parent | 002118dbf717284324a59ba19c8cecbad3c9a7bf (diff) | |
| parent | 187af93c1972b7c1930bc48a91c42a22ecba86ec (diff) | |
| download | nixlib-2b9372b2ca975cba434790eee2b75c01cad0fe02.tar nixlib-2b9372b2ca975cba434790eee2b75c01cad0fe02.tar.gz nixlib-2b9372b2ca975cba434790eee2b75c01cad0fe02.tar.bz2 nixlib-2b9372b2ca975cba434790eee2b75c01cad0fe02.tar.lz nixlib-2b9372b2ca975cba434790eee2b75c01cad0fe02.tar.xz nixlib-2b9372b2ca975cba434790eee2b75c01cad0fe02.tar.zst nixlib-2b9372b2ca975cba434790eee2b75c01cad0fe02.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/quartz-wm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/xcb-util-xrm.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 84904d48b1ee..0d7d6df87bc0 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin }: +{ lib, stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin }: let version = "1.3.1"; in stdenv.mkDerivation { @@ -22,7 +22,7 @@ in stdenv.mkDerivation { pkgconfig AppKit Xplugin Foundation ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.apsl20; platforms = platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index e868dbab7f60..cc8bf7dfa106 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: +{ lib, stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: stdenv.mkDerivation rec { version = "1.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxcb xcbutil ]; checkInputs = [ libX11 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "XCB utility functions for the X resource manager"; homepage = "https://github.com/Airblader/xcb-util-xrm"; license = licenses.mit; # X11 variant diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index cd5fac60abe4..96269b1a4f37 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby +{ lib, stdenv, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby , quartz-wm, fontconfig, xlsfonts, xfontsel , ttf_bitstream_vera, freefont_ttf, liberation_ttf , shell ? "${bashInteractive}/bin/bash" @@ -184,7 +184,7 @@ in stdenv.mkDerivation { --replace "@FONTCONFIG_FILE@" "$fontsConfPath" ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.darwin; maintainers = with maintainers; [ cstrahan ]; license = licenses.mit; |