From 02f11bca6095f54dea504a390906b33a033dae05 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 9 Jun 2018 02:10:22 +0200
Subject: [PATCH] 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/applications/window-managers/i3/gaps.nix        |  8 +++-----
 pkgs/development/interpreters/luajit/default.nix     | 12 +++++-------
 .../libraries/libcollectdclient/default.nix          |  5 ++---
 pkgs/servers/x11/xorg/xwayland.nix                   |  9 ++-------
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index d6668cde2bdc..251b893f92ff 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, i3, autoreconfHook }:
 
-i3.overrideDerivation (super : rec {
+i3.overrideAttrs (oldAttrs : rec {
 
   name = "i3-gaps-${version}";
   version = "4.15.0.1";
@@ -11,7 +11,7 @@ i3.overrideDerivation (super : rec {
     sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal";
   };
 
-  nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];
+  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
 
   postUnpack = ''
       echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
@@ -19,7 +19,6 @@ i3.overrideDerivation (super : rec {
 
   # fatal error: GENERATED_config_enums.h: No such file or directory
   enableParallelBuilding = false;
-}) // {
 
   meta = with stdenv.lib; {
     description = "A fork of the i3 tiling window manager with some additional features";
@@ -36,5 +35,4 @@ i3.overrideDerivation (super : rec {
       Configured via plain text file. Multi-monitor. UTF-8 clean.
     '';
   };
-
-}
+})
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 59394d3ccc88..73b979e9ca4f 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -7,10 +7,8 @@ rec {
     version = "2.0.5";
     isStable = true;
     sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
-  } // {
-    # 64-bit ARM isn't supported upstream
-    meta = meta // {
-      platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
+    meta = genericMeta // {
+      platforms = lib.filter (p: p != "aarch64-linux") genericMeta.platforms;
     };
   };
 
@@ -20,13 +18,12 @@ rec {
     sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs";
   };
 
-
-  meta = with stdenv.lib; {
+  genericMeta = with stdenv.lib; {
     description = "High-performance JIT compiler for Lua 5.1";
     homepage    = http://luajit.org;
     license     = licenses.mit;
     platforms   = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers ; [ thoughtpolice smironov vcunat andir ];
+    maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ];
   };
 
   generic =
@@ -37,6 +34,7 @@ rec {
         url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
         inherit sha256;
       })
+    , meta ? genericMeta
     }:
 
     stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index e4e61c942836..4f0ba439417f 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/pkgs/development/libraries/libcollectdclient/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, collectd }:
 with stdenv.lib;
 
-overrideDerivation collectd (oldAttrs: {
+collectd.overrideAttrs (oldAttrs: {
   name = "libcollectdclient-${collectd.version}";
   buildInputs = [ ];
 
@@ -16,7 +16,6 @@ overrideDerivation collectd (oldAttrs: {
 
   postInstall = "rm -rf $out/{bin,etc,sbin,share}";
 
-}) // {
   meta = with stdenv.lib; {
     description = "C Library for collectd, a daemon which collects system performance statistics periodically";
     homepage = http://collectd.org;
@@ -24,4 +23,4 @@ overrideDerivation collectd (oldAttrs: {
     platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable?
     maintainers = [ maintainers.sheenobu maintainers.bjornfor ];
   };
-}
+})
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;
   };
-}
-
-
-
+})