From 933822d579ee6c39fc35222dc4c207c20579fa42 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 18 Feb 2018 16:32:30 -0600 Subject: [PATCH] leo-editor: add local copy of pyqt56 since it was globally removed --- pkgs/applications/editors/leo-editor/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 924e662b8084..2084a047a086 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -1,5 +1,14 @@ -{ stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }: +{ stdenv, python3, libsForQt56, fetchFromGitHub, makeWrapper, makeDesktopItem }: +let + packageOverrides = self: super: { + pyqt56 = libsForQt56.callPackage ../../../development/python-modules/pyqt/5.x.nix { + pythonPackages = self; + }; + }; + + pythonPackages = (python3.override { inherit packageOverrides; }).pkgs; +in stdenv.mkDerivation rec { name = "leo-editor-${version}"; version = "5.6"; @@ -14,7 +23,7 @@ stdenv.mkDerivation rec { dontBuild = true; nativeBuildInputs = [ makeWrapper python3 ]; - propagatedBuildInputs = with python3.pkgs; [ pyqt56 docutils ]; + propagatedBuildInputs = with pythonPackages; [ pyqt56 docutils ]; desktopItem = makeDesktopItem rec { name = "leo-editor";