summary refs log tree commit diff
path: root/pkgs/development/tools/misc
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2018-04-19 16:27:24 -0500
committerGitHub <noreply@github.com>2018-04-19 16:27:24 -0500
commitf08f7d60993a16635364c08d5463d4eef5678a1e (patch)
tree2322c101d2865a3e57f86653085d603b7afd4300 /pkgs/development/tools/misc
parent7c8200811b2e706a62b31c6b87ced7de6c2844bf (diff)
parent582774828a3a6449035ac5ca4b5177e512d3b81e (diff)
downloadnixpkgs-f08f7d60993a16635364c08d5463d4eef5678a1e.tar
nixpkgs-f08f7d60993a16635364c08d5463d4eef5678a1e.tar.gz
nixpkgs-f08f7d60993a16635364c08d5463d4eef5678a1e.tar.bz2
nixpkgs-f08f7d60993a16635364c08d5463d4eef5678a1e.tar.lz
nixpkgs-f08f7d60993a16635364c08d5463d4eef5678a1e.tar.xz
nixpkgs-f08f7d60993a16635364c08d5463d4eef5678a1e.tar.zst
nixpkgs-f08f7d60993a16635364c08d5463d4eef5678a1e.zip
Merge pull request #39174 from xeji/gede-qt5
gede: switch to qt5
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r--pkgs/development/tools/misc/gede/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index ce02b476300..bcd5b02d30b 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 = ":";