From b36dc66bfea6b0a733cf13bed85d80462d39c736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 5 Mar 2019 13:30:39 +0100 Subject: [PATCH] python.pkgs.supervise_api: use patch to specify path to supervise --- .../python-modules/supervise_api/default.nix | 16 ++++++++++++---- .../supervise_api/supervise-path.patch | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/supervise_api/supervise-path.patch diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index e647696c02b7..47cdc8a28b11 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, substituteAll , supervise , isPy3k , whichcraft @@ -16,11 +17,18 @@ buildPythonPackage rec { sha256 = "1230f42294910e83421b7d3b08a968d27d510a4a709e966507ed70db5da1b9de"; }; - propagatedBuildInputs = [ - supervise - ] ++ lib.optionals ( !isPy3k ) [ - whichcraft + patches = [ + (substituteAll { + src = ./supervise-path.patch; + inherit supervise; + }) ]; + + # In the git repo, supervise_api lives inside a python subdir + patchFlags = [ "-p2" ]; + + propagatedBuildInputs = lib.optional (!isPy3k) whichcraft; + checkInputs = [ utillinux ]; meta = { diff --git a/pkgs/development/python-modules/supervise_api/supervise-path.patch b/pkgs/development/python-modules/supervise_api/supervise-path.patch new file mode 100644 index 000000000000..c5538ddc26e2 --- /dev/null +++ b/pkgs/development/python-modules/supervise_api/supervise-path.patch @@ -0,0 +1,15 @@ +diff --git a/python/supervise_api/supervise.py b/python/supervise_api/supervise.py +index 497d3ea..be57e35 100644 +--- a/python/supervise_api/supervise.py ++++ b/python/supervise_api/supervise.py +@@ -41,9 +41,7 @@ try: + except: + from whichcraft import which + +-supervise_utility_location = which("supervise") +-if not supervise_utility_location: +- raise FileNotFoundError(errno.ENOENT, "Executable not found in PATH", "supervise") ++supervise_utility_location = '@supervise@/bin/supervise' + + + def ignore_sigchld():