diff options
| author | Kevin Cox <kevincox@kevincox.ca> | 2022-02-15 08:18:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-15 08:18:32 -0500 |
| commit | 3cc1b8163d464e9e21793b4cd3b5333e9f768ab7 (patch) | |
| tree | 2450d14c213a4d54f0320841ed38074d33782bd0 /pkgs/applications/misc | |
| parent | 48036743de02692980aa6163110ea2169751e217 (diff) | |
| parent | 8144bd3050e1f16237834fcad9f5d4c4e9afcddf (diff) | |
Merge pull request #148937 from psydvl/Wike
Wike: fix: provide right python version instead of patching source
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/wike/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix index 0193321ef4bec..c3e5a505722c4 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; { |