--- a/custom-packages.nix	Mon May 16 22:34:02 2016 +0200
+++ b/custom-packages.nix	Sat Jun 04 17:55:58 2016 +0200
@@ -1,14 +1,15 @@
 { system ? builtins.currentSystem }:
 
 let
+  maintainers = import ./maintainers.nix;
   pkgs = import <nixpkgs> { inherit system; };
+  lib = pkgs.stdenv.lib // { inherit maintainers; };
+  stdenv = pkgs.stdenv // { inherit lib; };
 
-  stdenv.lib.maintainers = stdenv.lib.maintainers // {tzeman = "Tomáš Zeman <tzeman@volny.cz>";};
-  
-  callPackage = pkgs.lib.callPackageWith (pkgs // pkgs.xlibs // self);
+  callPackage = lib.callPackageWith (pkgs // pkgs.xlibs // self);
 
   self = {
-    qmailanalog = callPackage ./pkgs/qmailanalog { };
+    qmailanalog = callPackage ./pkgs/qmailanalog { inherit stdenv; };
   };
 in
 self