about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2018-06-09 02:10:22 +0200
committerSilvan Mosberger <infinisil@icloud.com>2018-06-14 22:28:55 +0200
commit02f11bca6095f54dea504a390906b33a033dae05 (patch)
tree7878cd1e08cf8b63cff6eeed16ec0814590db5ce /pkgs/servers
parenta7e9fabd7b3d11dd19b10f77599b66a4be74a523 (diff)
downloadnixlib-02f11bca6095f54dea504a390906b33a033dae05.tar
nixlib-02f11bca6095f54dea504a390906b33a033dae05.tar.gz
nixlib-02f11bca6095f54dea504a390906b33a033dae05.tar.bz2
nixlib-02f11bca6095f54dea504a390906b33a033dae05.tar.lz
nixlib-02f11bca6095f54dea504a390906b33a033dae05.tar.xz
nixlib-02f11bca6095f54dea504a390906b33a033dae05.tar.zst
nixlib-02f11bca6095f54dea504a390906b33a033dae05.zip
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.
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/x11/xorg/xwayland.nix9
1 files changed, 2 insertions, 7 deletions
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;
   };
-}
-
-
-
+})