b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #35152 from dtzWill/update/leo-5.6

Browse source 
leo-editor: 5.5 -> 5.6
This commit is contained in:
Joachim F 2018-02-19 09:38:12 +00:00 committed by GitHub
parent 944792269e 933822d579
commit 83cc0cddd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/applications/editors/leo-editor/default.nix
View file

@ -1,20 +1,29 @@
{ stdenv, python3Packages, 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.5";
version = "5.6";
src = fetchFromGitHub {
owner = "leo-editor";
repo = "leo-editor";
rev = version;
sha256 = "0crzljirzfiy9xn02ydd23clmd8bzdjxkyxdqsvdkgfy9j41b8hr";
sha256 = "1k6q3gvaf05bi0mzkmmb1p6wrgxwri7ivn38p6f0m0wfd3f70x2j";
};
dontBuild = true;
nativeBuildInputs = [ makeWrapper python3Packages.python ];
propagatedBuildInputs = with python3Packages; [ pyqt5 ];
nativeBuildInputs = [ makeWrapper python3 ];
propagatedBuildInputs = with pythonPackages; [ pyqt56 docutils ];
desktopItem = makeDesktopItem rec {
name = "leo-editor";
@ -50,7 +59,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/leo-editor
mv * $out/share/leo-editor
makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \
makeWrapper ${python3.interpreter} $out/bin/leo \
--set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \
--add-flags "-O $out/share/leo-editor/launchLeo.py"
'';