Merge pull request #148937 from psydvl/Wike
Wike: fix: provide right python version instead of patching source
This commit is contained in:
commit
3cc1b8163d
1 changed files with 9 additions and 9 deletions
|
@ -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; {
|
||||
|
|
Loading…
Reference in a new issue