From 582774828a3a6449035ac5ca4b5177e512d3b81e Mon Sep 17 00:00:00 2001 From: xeji Date: Thu, 19 Apr 2018 22:58:21 +0200 Subject: [PATCH] gede: switch to qt5 --- pkgs/development/tools/misc/gede/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index ce02b4763009..bcd5b02d30b8 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python, qt4, ctags, gdb }: +{ stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }: stdenv.mkDerivation rec { name = "gede-${version}"; @@ -9,12 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0jallpchl3c3i90hwic4n7n0ggk5wra0fki4by9ag26ln0k42c4r"; }; - nativeBuildInputs = [ makeWrapper python ]; + nativeBuildInputs = [ qmake makeWrapper python ]; - buildInputs = [ qt4 ctags ]; + buildInputs = [ ctags ]; + + dontUseQmakeConfigure = true; postPatch = '' - sed -i build.py -e 's,qmake-qt4,qmake,' + sed -i build.py -e 's,qmake-qt5,qmake,' ''; buildPhase = ":"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05bb159a5f77..d5369c15d5d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7823,7 +7823,7 @@ with pkgs; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - gede = callPackage ../development/tools/misc/gede { }; + gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = callPackage ../development/tools/misc/gdbgui { };