refact: make packages function-like

3 files changed, 8 insertions, 17 deletions

diff --git a/clever-tools/default.nix b/clever-tools/default.nix
index 8032014..497e911 100644
--- a/clever-tools/default.nix
+++ b/clever-tools/default.nix
@@ -1,14 +1,9 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-with pkgs;
+{ stdenv, fetchurl, glibc, nodegit }:
 
 let
   version = "0.9.3";
 
-  nodegit = import ../nodegit/default.nix { inherit pkgs; };
-
   libs = [ stdenv.cc.cc glibc ];
-
 in
 
   stdenv.mkDerivation {
diff --git a/default.nix b/default.nix
index 094b3b0..84ed9be 100644
--- a/default.nix
+++ b/default.nix
@@ -1,3 +1,5 @@
 with import <nixpkgs> {};
 
-callPackage ./clever-tools {}
+callPackage ./clever-tools {
+  nodegit = callPackage ./nodegit {};
+}
diff --git a/nodegit/default.nix b/nodegit/default.nix
index aee9fcf..83d734a 100644
--- a/nodegit/default.nix
+++ b/nodegit/default.nix
@@ -1,23 +1,17 @@
-{ pkgs }:
+{ stdenv, fetchurl, curl, glibc, openssl }:
 
 let
   version = "0.20.3";
 
-  stdenv = pkgs.stdenv;
-  fetchurl = pkgs.fetchurl;
-
-  curl = pkgs.curl.override {
+  curlWithGnutls = curl.override {
     sslSupport = false;
     gnutlsSupport = true;
   };
-  glibc = pkgs.glibc;
-  openssl = pkgs.openssl;
-
-  libs = [ stdenv.cc.cc curl glibc openssl ];
 
+  libs = [ stdenv.cc.cc curlWithGnutls glibc openssl ];
 in
 
-  assert pkgs.stdenv.system == "x86_64-linux";
+  assert stdenv.system == "x86_64-linux";
 
   stdenv.mkDerivation {
     name = "nodegit-${version}-node-v51";