From d7e5393ffecebf9bad30868f2fe53f40fec8ce68 Mon Sep 17 00:00:00 2001
From: Sarah <cid+git@cid-chan.moe>
Date: Sun, 17 Oct 2021 12:14:55 +0200
Subject: [PATCH] Make default.nix work.

---
 .gitignore  |  2 +-
 default.nix | 15 ++++++++++++---
 setup.py    |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 05c6dc4..e29d92f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,4 +144,4 @@ cython_debug/
 
 # End of https://www.toptal.com/developers/gitignore/api/python
 
-result/
+result
diff --git a/default.nix b/default.nix
index f05c94e..22865ad 100644
--- a/default.nix
+++ b/default.nix
@@ -1,10 +1,19 @@
-{ pkgs, lib, ... }:
 let
-  sources = import ./sources.nix {};
+  sources = import ./nix/sources.nix {};
+in
+{ pkgs ? import sources.nixpkgs {},
+  lib ? pkgs.lib,
+  ... 
+}:
+let
   mach-nix = import sources.mach-nix {
     inherit pkgs;
   };
 in
 mach-nix.buildPythonApplication {
-  src = lib.cleanSource ./..;
+  name = "peerix";
+  python = "python39";
+  src = lib.cleanSource ./.;
+  version = builtins.readFile ./VERSION;
+  requirements = builtins.readFile ./requirements.txt;
 }
diff --git a/setup.py b/setup.py
index 536ca4b..fad802c 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ from distutils.core import setup
 DIR = os.path.dirname(__file__)
 
 with open(os.path.join(DIR, "requirements.txt")) as f:
-    requirements = f.readlines()
+    requirements = [l.strip() for l in f.readlines()]
 
 with open(os.path.join(DIR, "VERSION")) as f:
     version = f.read().strip()