From e5f0d13a490c5555a816d0ded86883993ed25be5 Mon Sep 17 00:00:00 2001 From: Marco Hennings Date: Sat, 27 Jun 2020 23:54:57 +0200 Subject: [PATCH] gitAndTools.stgit: Fix broken package. (#84198) The stgit package is installing using make, which leaves the application in a state where it can not properly find the installed package stgit. --- File "/run/current-system/sw/bin/stg", line 35, in from stgit.main import main ImportError: No module named stgit.main --- This is fixed by using buildPythonApplication instead of stdenv.mkDerivation. --- .../git-and-tools/stgit/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 2cd4adce9397..36ea373177ac 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchFromGitHub, python2, git }: +{ stdenv, python3, python3Packages, fetchFromGitHub, git }: -let - name = "stgit-${version}"; +python3Packages.buildPythonApplication rec { + pname = "stgit"; version = "0.22"; -in -stdenv.mkDerivation { - inherit name; src = fetchFromGitHub { owner = "ctmarinas"; @@ -14,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0xpvs5fa50rrvl2c8naha1nblk5ip2mgg63a9srqqxfx6z8qmrfz"; }; - buildInputs = [ python2 git ]; + nativeBuildInputs = [ git ]; makeFlags = [ "prefix=$$out" ];