Skip to content

Commit

Permalink
Revert "Merge pull request #30031 from dtzWill/update/leo-5.6"
Browse files Browse the repository at this point in the history
This reverts commit 67c5cb2, reversing
changes made to 431c004.

I failed to notice that this depends on a package that had since
been removed. My bad :(
  • Loading branch information
joachifm committed Feb 17, 2018
1 parent 635011f commit 05f5cdc
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions pkgs/applications/editors/leo-editor/default.nix
@@ -1,20 +1,20 @@
{ stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }:
{ stdenv, python3Packages, fetchFromGitHub, makeWrapper, makeDesktopItem }:

stdenv.mkDerivation rec {
name = "leo-editor-${version}";
version = "5.6";
version = "5.5";

src = fetchFromGitHub {
owner = "leo-editor";
repo = "leo-editor";
rev = version;
sha256 = "1k6q3gvaf05bi0mzkmmb1p6wrgxwri7ivn38p6f0m0wfd3f70x2j";
sha256 = "0crzljirzfiy9xn02ydd23clmd8bzdjxkyxdqsvdkgfy9j41b8hr";
};

dontBuild = true;

nativeBuildInputs = [ makeWrapper python3 ];
propagatedBuildInputs = with python3.pkgs; [ pyqt56 docutils ];
nativeBuildInputs = [ makeWrapper python3Packages.python ];
propagatedBuildInputs = with python3Packages; [ pyqt5 ];

desktopItem = makeDesktopItem rec {
name = "leo-editor";
Expand Down Expand Up @@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/leo-editor
mv * $out/share/leo-editor
makeWrapper ${python3.interpreter} $out/bin/leo \
makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \
--set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \
--add-flags "-O $out/share/leo-editor/launchLeo.py"
'';
Expand Down

0 comments on commit 05f5cdc

Please sign in to comment.