From 94b8d29d43facce54a86bd01ee0c10324299eb11 Mon Sep 17 00:00:00 2001 From: Denis Lehmann Date: Thu, 15 Jul 2021 09:43:43 +0200 Subject: [PATCH] update flake and setup scheme --- flake.nix | 21 ++++++++------------- bin/huepaper => huepaper.py | 1 - setup.py | 6 ++++++ 3 files changed, 14 insertions(+), 14 deletions(-) rename bin/huepaper => huepaper.py (99%) diff --git a/flake.nix b/flake.nix index d3df024..9b42fbb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "A colorful wallpaper generator"; - nixConfig.bash-prompt = "\[\\e[1m\\e[34mhuepaper-develop\\e[0m\]$ "; + nixConfig.bash-prompt = "\[\\e[1m\\e[34mhuepaper-dev\\e[0m:\\w\]$ "; inputs.flake-utils.url = "github:numtide/flake-utils"; @@ -15,31 +15,26 @@ { # Package - packages.huepaper = - pkgs.python3Packages.buildPythonPackage rec { - name = "huepaper"; src = self; - - nativeBuildInputs = with pkgs; [ - wrapGAppsHook - ]; - propagatedBuildInputs = with pkgs; [ python3Packages.colour python3Packages.pillow ]; - }; - defaultPackage = self.packages.${system}.huepaper; + # App + apps.huepaper = { + type = "app"; + program = "${self.packages.${system}.huepaper}/bin/huepaper"; + }; + defaultApp = self.apps.${system}.huepaper; + # Development shell - devShell = pkgs.mkShell { - buildInputs = with pkgs; [ python3 python3Packages.colour diff --git a/bin/huepaper b/huepaper.py similarity index 99% rename from bin/huepaper rename to huepaper.py index fd15dcd..14c0383 100755 --- a/bin/huepaper +++ b/huepaper.py @@ -10,7 +10,6 @@ from huepaper import ( save_image, ) import argparse -import os.path def print_greeter(): diff --git a/setup.py b/setup.py index c424e50..0976e7a 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,10 @@ from setuptools import setup +import os +import shutil + +if not os.path.exists("bin"): + os.makedirs("bin") +shutil.copyfile("huepaper.py", "bin/huepaper") setup( name="huepaper",