Merge pull request #60915 from aanderse/issue/60498

kupfer: fix broken build
This commit is contained in:
Aaron Andersen 2019-05-04 20:23:39 -04:00 committed by GitHub
commit 1ef93c9c51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions

View File

@ -14,7 +14,7 @@
with python3Packages; with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
name = "kupfer-${version}"; pname = "kupfer";
version = "319"; version = "319";
src = fetchurl { src = fetchurl {
@ -30,6 +30,10 @@ buildPythonApplication rec {
buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ];
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
# without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk'
# see https://github.com/NixOS/nixpkgs/issues/56943 for details
strictDeps = false;
postInstall = let postInstall = let
pythonPath = (stdenv.lib.concatMapStringsSep ":" pythonPath = (stdenv.lib.concatMapStringsSep ":"
(m: "${m}/lib/${python.libPrefix}/site-packages") (m: "${m}/lib/${python.libPrefix}/site-packages")

View File

@ -18441,7 +18441,11 @@ in
kubetail = callPackage ../applications/networking/cluster/kubetail { } ; kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
kupfer = callPackage ../applications/misc/kupfer { }; kupfer = callPackage ../applications/misc/kupfer {
# using python36 as there appears to be a waf issue with python37
# see https://github.com/NixOS/nixpkgs/issues/60498
python3Packages = python36Packages;
};
lame = callPackage ../development/libraries/lame { }; lame = callPackage ../development/libraries/lame { };