From 02f11bca6095f54dea504a390906b33a033dae05 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 9 Jun 2018 02:10:22 +0200 Subject: some overrideDerivation cleanups These four top-level packages were the only ones that didn't have the meta.position attribute automagically set. This commit fixes this. --- pkgs/servers/x11/xorg/xwayland.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 6de53faf7710..4c728d2e3e79 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,9 +1,8 @@ - { stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }: with stdenv.lib; -overrideDerivation xorgserver (oldAttrs: { +xorgserver.overrideAttrs (oldAttrs: { name = "xwayland-${xorgserver.version}"; propagatedBuildInputs = oldAttrs.propagatedBuildInputs @@ -28,14 +27,10 @@ overrideDerivation xorgserver (oldAttrs: { rm -fr $out/share/X11/xkb/compiled ''; -}) // { meta = { description = "An X server for interfacing X11 apps with the Wayland protocol"; homepage = http://wayland.freedesktop.org/xserver.html; license = licenses.mit; platforms = platforms.linux; }; -} - - - +}) -- cgit 1.4.1