From 545af899c2b4178a5bf8ffe5636e04a6939ad055 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 4 May 2019 08:11:12 -0400 Subject: [PATCH 1/2] kupfer: fix broken build --- pkgs/applications/misc/kupfer/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 33a2cf932095..7acbd3389f9a 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -30,6 +30,10 @@ buildPythonApplication rec { buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; 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 pythonPath = (stdenv.lib.concatMapStringsSep ":" (m: "${m}/lib/${python.libPrefix}/site-packages") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fe00d164ef7..3554588f847f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18433,7 +18433,11 @@ in 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 { }; From fc32b49933ed3930af1fe578d180e36565e9da67 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 4 May 2019 08:14:37 -0400 Subject: [PATCH 2/2] kupfer: switch from `name` to `pname` --- pkgs/applications/misc/kupfer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 7acbd3389f9a..81cba3f56378 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -14,7 +14,7 @@ with python3Packages; buildPythonApplication rec { - name = "kupfer-${version}"; + pname = "kupfer"; version = "319"; src = fetchurl {