alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #39174 from xeji/gede-qt5

Browse source 
gede: switch to qt5
This commit is contained in:
Will Dietz 2018-04-19 16:27:24 -05:00 committed by GitHub
parent 7c8200811b 582774828a
commit f08f7d6099
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/tools/misc/gede/default.nix
View file

@ -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 = ":";

2
pkgs/top-level/all-packages.nix
View file

@ -7822,7 +7822,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 { };