diff options
| author | xeji <xeji@cat3.de> | 2018-04-19 22:58:21 +0200 |
|---|---|---|
| committer | xeji <xeji@cat3.de> | 2018-04-19 23:00:08 +0200 |
| commit | 582774828a3a6449035ac5ca4b5177e512d3b81e (patch) | |
| tree | 2dfb1c26814d8b96c6c97b70dbc11d1ae64e766c /pkgs | |
| parent | 3dd676c1af5c673b1cb3ea6dc2f61054ccdcd6e1 (diff) | |
| download | nixpkgs-582774828a3a6449035ac5ca4b5177e512d3b81e.tar nixpkgs-582774828a3a6449035ac5ca4b5177e512d3b81e.tar.gz nixpkgs-582774828a3a6449035ac5ca4b5177e512d3b81e.tar.bz2 nixpkgs-582774828a3a6449035ac5ca4b5177e512d3b81e.tar.lz nixpkgs-582774828a3a6449035ac5ca4b5177e512d3b81e.tar.xz nixpkgs-582774828a3a6449035ac5ca4b5177e512d3b81e.tar.zst nixpkgs-582774828a3a6449035ac5ca4b5177e512d3b81e.zip | |
gede: switch to qt5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/gede/default.nix | 10 | ||||
| -rw-r--r-- | 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 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 = ":"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05bb159a5f7..d5369c15d5d 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 { }; |