From 1c289eafe041d7730a834bb437b7173ca4b9e2c9 Mon Sep 17 00:00:00 2001
From: vuko <vuko@hackerspace.pl>
Date: Mon, 9 Nov 2020 13:24:52 +0100
Subject: [PATCH] use callPackage

---
 flask-oauthlib.nix    | 9 +++------
 requests-oauthlib.nix | 4 ++--
 spaceauth.nix         | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/flask-oauthlib.nix b/flask-oauthlib.nix
index be86b8e..1b0969c 100644
--- a/flask-oauthlib.nix
+++ b/flask-oauthlib.nix
@@ -9,14 +9,11 @@ pkgs.python3Packages.buildPythonPackage rec {
     rev = "572922bd8d916970ed66aeec32955c992828a473";
     sha256 = "1bmjl1j0m0fy4zwnhpadx0mzbi893qp9x7dm4nypsvczbcaqjbm0";
   };
-  buildInputs = [
-    (import ./oauthlib.nix {})
-    (import ./requests-oauthlib.nix {})
-  ];
   propagatedBuildInputs = [
-    (import ./oauthlib.nix {})
-    (import ./requests-oauthlib.nix {})
+    (pkgs.callPackage ./oauthlib.nix {} )
+    (pkgs.callPackage ./requests-oauthlib.nix {} )
     pkgs.python3Packages.flask
+    pkgs.python3Packages.setuptools
   ];
   doCheck = false;
 }
diff --git a/requests-oauthlib.nix b/requests-oauthlib.nix
index 9d15b4c..84a306a 100644
--- a/requests-oauthlib.nix
+++ b/requests-oauthlib.nix
@@ -1,4 +1,3 @@
-
 { pkgs ? import <nixpkgs> {} }:
 
 pkgs.python3Packages.buildPythonPackage rec {
@@ -11,8 +10,9 @@ pkgs.python3Packages.buildPythonPackage rec {
     sha256 = "03jqw5a7i2k8qfb2h2aj3nwy115mk3bgm9zplh3a83x6qv8hs3c3";
   };
   propagatedBuildInputs = [
+    pkgs.python3Packages.setuptools
     pkgs.python3Packages.requests
-    (import ./oauthlib.nix {})
+    (pkgs.callPackage ./oauthlib.nix { })
   ];
   doCheck=false;
 }
diff --git a/spaceauth.nix b/spaceauth.nix
index 1be3618..20633ed 100644
--- a/spaceauth.nix
+++ b/spaceauth.nix
@@ -12,6 +12,6 @@ pkgs.python3Packages.buildPythonPackage rec {
     pkgs.python3Packages.flask
     pkgs.python3Packages.flask_login
     pkgs.python3Packages.blinker
-    (import ./flask-oauthlib.nix {})
+    (pkgs.callPackage ./flask-oauthlib.nix {})
   ];
 }