From 8144bd3050e1f16237834fcad9f5d4c4e9afcddf Mon Sep 17 00:00:00 2001 From: Dmitriy <43755002+psydvl@users.noreply.github.com> Date: Tue, 15 Feb 2022 16:02:28 +0300 Subject: [PATCH] Fix: provide right python version instead of patching source --- pkgs/applications/misc/wike/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix index 0193321ef4be..c3e5a505722c 100644 --- a/pkgs/applications/misc/wike/default.nix +++ b/pkgs/applications/misc/wike/default.nix @@ -7,14 +7,12 @@ , libhandy, webkitgtk, glib-networking , gnome, dconf }: -let - pythonEnv = python3.withPackages (p: with p; [ - pygobject3 - requests - ]); -in stdenv.mkDerivation rec { + +python3.pkgs.buildPythonApplication rec { pname = "wike"; version = "1.7.1"; + format = "other"; + strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitHub { owner = "hugolabe"; @@ -35,7 +33,6 @@ in stdenv.mkDerivation rec { buildInputs = [ glib - pythonEnv gtk3 libhandy webkitgtk @@ -44,10 +41,13 @@ in stdenv.mkDerivation rec { dconf ]; + propagatedBuildInputs = with python3.pkgs; [ + requests + pygobject3 + ]; + postPatch = '' patchShebangs build-aux/meson/postinstall.py - substituteInPlace src/wike.in --replace "@PYTHON@" "${pythonEnv}/bin/python" - substituteInPlace src/wike-sp.in --replace "@PYTHON@" "${pythonEnv}/bin/python" ''; meta = with lib; {