I must enjoy torturing myself

flake.nix

@@ -25,7 +25,6 @@
 
         mypkgs = ps: builtins.intersectAttrs (overlay 42 42) ps;
 
-
         addEverything = system: pkgs: ps: ps // {
           everything =
             let

pkgs/all-packages.nix

@@ -88,7 +88,7 @@ self: super:
 
   transfersh = self.callPackage ./transfersh.nix {};
 
-  inherit ((self.callPackages ./wrap-derivation-output.nix { inherit self; }).fns)
+  inherit (self.callPackages ./wrap-derivation-output.nix { inherit self; })
     modifyDerivationOutput
     wrapDerivationOutput;
 

pkgs/wrap-derivation-output.nix

@@ -14,34 +14,32 @@ let
 in
 
 {
-  fns = {
-    modifyDerivationOutput =
-      drv:
-      { buildInputs ? []
-      , nativeBuildInputs ? []
-      , extraCommands
-      , ...
-      }@args:
-      stdenv.mkDerivation (getDerivationName args // {
-        inherit buildInputs nativeBuildInputs;
-        dontUnpack = true;
-        installPhase = ''
-          runHook preInstall
-          mkdir $out
-          ${lndir}/bin/lndir -silent ${drv} $out
-          ${extraCommands}
-          runHook postInstall
-        '';
-        meta.platforms = drv.meta.platforms;
-      });
+  modifyDerivationOutput =
+    drv:
+    { buildInputs ? []
+    , nativeBuildInputs ? []
+    , extraCommands
+    , ...
+    }@args:
+    stdenv.mkDerivation (getDerivationName args // {
+      inherit buildInputs nativeBuildInputs;
+      dontUnpack = true;
+      installPhase = ''
+        runHook preInstall
+        mkdir $out
+        ${lndir}/bin/lndir -silent ${drv} $out
+        ${extraCommands}
+        runHook postInstall
+      '';
+      meta.platforms = drv.meta.platforms;
+    });
 
-    wrapDerivationOutput = drv: path: args:
-      self.modifyDerivationOutput drv (getDerivationName drv // {
-        nativeBuildInputs = [ makeWrapper ];
-        extraCommands = ''
-          mv $out/${path} $out/${path}-unwrapped
-          makeWrapper $out/${path}-unwrapped $out/${path} ${args}
-        '';
-      });
-  };
+  wrapDerivationOutput = drv: path: args:
+    self.modifyDerivationOutput drv (getDerivationName drv // {
+      nativeBuildInputs = [ makeWrapper ];
+      extraCommands = ''
+        mv $out/${path} $out/${path}-unwrapped
+        makeWrapper $out/${path}-unwrapped $out/${path} ${args}
+      '';
+    });
 }