From 095d14ff2469c8f3de7cbf45d229c0f46a733aae Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Sun, 23 Apr 2023 15:10:36 +1000 Subject: [PATCH] at least site builds?? --- flake.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 50efd68..cf68a6a 100644 --- a/flake.nix +++ b/flake.nix @@ -13,8 +13,7 @@ (system: let pkgs = nixpkgs.legacyPackages.${system}; - my-python = pkgs.python39; - finalPython = my-python.override { packageOverrides = poonam.overlays.default; }; + finalPython = pkgs.python3.override { packageOverrides = poonam.overlays.default; self = finalPython; }; python-with-my-packages = finalPython.withPackages (p: with p; [ jinja2 click @@ -23,12 +22,6 @@ python-ctags3 # other python packages you want in the devShell ]); - python-deps = finalPython.withPackages (p: with p; [ - # Packages necessary at runtime to run build script - poonam - jinja2 - python-ctags3 - ]); in { devShell = pkgs.mkShell { @@ -43,11 +36,14 @@ # maybe set more env-vars ''; }; - packages.basant = finalPython.pkgs.pythonPackages.buildPythonApplication { + packages.basant = with finalPython.pkgs; buildPythonApplication { pname = "basant"; src = ./.; version = "0.3"; - propagatedBuildInputs = [ python-deps ]; + propagatedBuildInputs = [ poonam.packages.${system}.poonam jinja2 python-ctags3 ]; + passthru = { + python = finalPython; # for running? + }; doCheck = false; }; packages.site = pkgs.stdenv.mkDerivation {