# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2018-10-24 09:35:27
# Node ID b4b7374ccab8e26a79abcb74009cb8204038dd7c
# Parent  956bb6e48562c832da4f192b4bb6287b56f1a3ba

packaging: use common structure that rhodecode-enterprise-ce is using for easier diffs

diff --git a/default.nix b/default.nix
--- a/default.nix
+++ b/default.nix
@@ -15,15 +15,13 @@ let pkgs_ = (import <nixpkgs> {}); in
 
 let
 
-  # TODO: Currently we ignore the passed in pkgs, instead we should use it
-  # somehow as a base and apply overlays to it.
-  pkgs = import <nixpkgs> {
+  pkgs = args.pkgs or (import <nixpkgs> {
     overlays = [
       (import ./pkgs/overlays.nix)
     ];
     inherit (pkgs_)
       system;
-  };
+  });
 
   # Works with the new python-packages, still can fallback to the old
   # variant.
diff --git a/shell.nix b/shell.nix
--- a/shell.nix
+++ b/shell.nix
@@ -10,7 +10,6 @@ let
 
   vcsserver = import ./default.nix {
     inherit
-      pkgs
       doCheck;
   };