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

Revert "Revert "Merge pull request #30031 from dtzWill/update/leo-5.6""

Browse Source 
This reverts commit 05f5cdcf66.
This commit is contained in:
Will Dietz 2018-02-18 16:24:59 -06:00
parent 3ab38ef086
commit 4139a6f0e5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/editors/leo-editor/default.nix
View File

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