colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #148937 from psydvl/Wike

Browse Source 
Wike: fix: provide right python version instead of patching source
This commit is contained in:
Kevin Cox 2022-02-15 08:18:32 -05:00 committed by GitHub
commit 3cc1b8163d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/misc/wike/default.nix
View File

@ -7,14 +7,12 @@
, libhandy, webkitgtk, glib-networking , libhandy, webkitgtk, glib-networking
, gnome, dconf , gnome, dconf
}: }:
let
pythonEnv = python3.withPackages (p: with p; [ python3.pkgs.buildPythonApplication rec {
pygobject3
requests
]);
in stdenv.mkDerivation rec {
pname = "wike"; pname = "wike";
version = "1.7.1"; version = "1.7.1";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hugolabe"; owner = "hugolabe";
@ -35,7 +33,6 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
pythonEnv
gtk3 gtk3
libhandy libhandy
webkitgtk webkitgtk
@ -44,10 +41,13 @@ in stdenv.mkDerivation rec {
dconf dconf
]; ];
propagatedBuildInputs = with python3.pkgs; [
requests
pygobject3
];
postPatch = '' postPatch = ''
patchShebangs build-aux/meson/postinstall.py 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; { meta = with lib; {