Permalink
Browse files

Merge pull request #33803 from adisbladis/qt59

Change package builds to use Qt 5.9
  • Loading branch information...
Mic92 committed Jan 13, 2018
2 parents 970a3e3 + f40a969 commit 0323fc27003ab6b83ac78f732dfc39899411c11d
Showing with 16 additions and 7 deletions.
  1. +9 −0 pkgs/development/tools/vogl/default.nix
  2. +7 −7 pkgs/top-level/all-packages.nix
@@ -4,6 +4,7 @@
, libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
, SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
, freeglut, mesa_glu
, fetchpatch
}:
mkDerivation rec {
@@ -17,6 +18,14 @@ mkDerivation rec {
sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n";
};
patches = [
(fetchpatch {
name = "fix-qt59.patch";
url = "https://github.com/ValveSoftware/vogl/commit/be3d85f.patch";
sha256 = "1yh4jd35mds337waqxdw3w22w7ghn05b5jm7fb4iihl39mhq6qyv";
})
];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
@@ -485,7 +485,7 @@ with pkgs;
withGui = false;
};
apitrace = libsForQt56.callPackage ../applications/graphics/apitrace {};
apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {};
argus = callPackage ../tools/networking/argus {};
@@ -2715,7 +2715,7 @@ with pkgs;
hotpatch = callPackage ../development/libraries/hotpatch { };
hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { };
hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { };
hping = callPackage ../tools/networking/hping { };
@@ -16307,7 +16307,7 @@ with pkgs;
nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };
notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { };
notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };
notmuch = callPackage ../applications/networking/mailreaders/notmuch {
gmime = gmime3;
@@ -16727,7 +16727,7 @@ with pkgs;
wxGTK = wxGTK30;
};
rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; };
rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; };
rapidsvn = callPackage ../applications/version-management/rapidsvn { };
@@ -16764,7 +16764,7 @@ with pkgs;
retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
retroshare06 = retroshare;
ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { };
ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { };
ripser = callPackage ../applications/science/math/ripser { };
@@ -17287,7 +17287,7 @@ with pkgs;
tribler = callPackage ../applications/networking/p2p/tribler { };
trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { };
trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { };
@@ -17487,7 +17487,7 @@ with pkgs;
vnstat = callPackage ../applications/networking/vnstat { };
vogl = qt56.callPackage ../development/tools/vogl { };
vogl = libsForQt5.callPackage ../development/tools/vogl { };
volnoti = callPackage ../applications/misc/volnoti { };

0 comments on commit 0323fc2

Please sign in to comment.