From 33ec57356a582f4fbfb4dfad45978653065a8ff3 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Jan 2018 18:38:23 +0800 Subject: [PATCH 1/7] vogl: Fix build with qt59 --- pkgs/development/tools/vogl/default.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index e351a75db4b2..9230d99efcc7 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.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 = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71668f56bc46..08a542483b0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17485,7 +17485,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 { }; From 07fbb158a8706c63634105d4c267aca03644bd00 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Jan 2018 18:46:35 +0800 Subject: [PATCH 2/7] trojita: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08a542483b0c..7974bbc4a4e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17285,7 +17285,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 { }; From 9aa93dec6710966622b590391be2706d5b22f7b2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Jan 2018 19:00:29 +0800 Subject: [PATCH 3/7] apitrace: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7974bbc4a4e5..de74b82edf74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; From 0281a20de0e38d15beb057e31f181fd28d0cb3c1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 17:39:49 +0800 Subject: [PATCH 4/7] hotspot: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de74b82edf74..31d20428175b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 7335a9cc8fbc72a50109d6c4bec866c4fecbcafd Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 17:46:30 +0800 Subject: [PATCH 5/7] ricochet: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31d20428175b..ecdc91958efd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16762,7 +16762,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 { }; From 9c03f4fad1f2499aa40077b3f43ba6f356b632f2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 18:11:53 +0800 Subject: [PATCH 6/7] rapcad: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecdc91958efd..bf10c58df296 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16725,7 +16725,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 { }; From f40a9695eac38085f8db429dc4569f356b09cb8b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 22:24:33 +0800 Subject: [PATCH 7/7] notepadqq: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf10c58df296..60e874a265f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16305,7 +16305,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;