Merge pull request #41732 from Infinisil/overrideDerivation

some overrideDerivation cleanups

pkgs/applications/window-managers/i3/gaps.nix

···
 { fetchurl, stdenv, i3, autoreconfHook }:
 
-i3.overrideDerivation (super : rec {
+i3.overrideAttrs (oldAttrs : rec {
 
   name = "i3-gaps-${version}";
   version = "4.15.0.1";
···
     sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal";
   };
 
-  nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];
+  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
 
   postUnpack = ''
       echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
···
 
   # 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";
···
       Configured via plain text file. Multi-monitor. UTF-8 clean.
     '';
   };
-
-}
+})

pkgs/development/interpreters/luajit/default.nix

···
     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;
     };
   };
 
···
     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 =
···
         url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
         inherit sha256;
       })
+    , meta ? genericMeta
     }:
 
     stdenv.mkDerivation rec {

pkgs/development/libraries/libcollectdclient/default.nix

···
 { stdenv, fetchurl, collectd }:
 with stdenv.lib;
 
-overrideDerivation collectd (oldAttrs: {
+collectd.overrideAttrs (oldAttrs: {
   name = "libcollectdclient-${collectd.version}";
   buildInputs = [ ];
 
···
 
   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;
···
     platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable?
     maintainers = [ maintainers.sheenobu maintainers.bjornfor ];
   };
-}
+})

pkgs/servers/x11/xorg/xwayland.nix

···
-
 { 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
···
     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;
   };
-}
-
-
-
+})