public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33803 from adisbladis/qt59

Browse Source 
Change package builds to use Qt 5.9
This commit is contained in:
Jörg Thalheim 2018-01-13 11:46:07 +00:00 committed by GitHub
commit 0323fc2700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/vogl/default.nix
View File

@ -4,6 +4,7 @@
, libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
, SDL2, SDL2_gfx, SDL2_image, SDL2_ttf , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
, freeglut, mesa_glu , freeglut, mesa_glu
, fetchpatch
}: }:
mkDerivation rec { mkDerivation rec {
@ -17,6 +18,14 @@ mkDerivation rec {
sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n"; sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n";
}; };
patches = [
(fetchpatch {
name = "fix-qt59.patch";
url = "https://github.com/ValveSoftware/vogl/commit/be3d85f.patch";
sha256 = "1yh4jd35mds337waqxdw3w22w7ghn05b5jm7fb4iihl39mhq6qyv";
})
];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [

14
pkgs/top-level/all-packages.nix
View File

@ -485,7 +485,7 @@ with pkgs;
withGui = false; withGui = false;
}; };
apitrace = libsForQt56.callPackage ../applications/graphics/apitrace {}; apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {};
argus = callPackage ../tools/networking/argus {}; argus = callPackage ../tools/networking/argus {};
@ -2715,7 +2715,7 @@ with pkgs;
hotpatch = callPackage ../development/libraries/hotpatch { }; hotpatch = callPackage ../development/libraries/hotpatch { };
hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { }; hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { };
hping = callPackage ../tools/networking/hping { }; hping = callPackage ../tools/networking/hping { };
@ -16307,7 +16307,7 @@ with pkgs;
nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };
notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { }; notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };
notmuch = callPackage ../applications/networking/mailreaders/notmuch { notmuch = callPackage ../applications/networking/mailreaders/notmuch {
gmime = gmime3; gmime = gmime3;
@ -16727,7 +16727,7 @@ with pkgs;
wxGTK = wxGTK30; wxGTK = wxGTK30;
}; };
rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; };
rapidsvn = callPackage ../applications/version-management/rapidsvn { }; rapidsvn = callPackage ../applications/version-management/rapidsvn { };
@ -16764,7 +16764,7 @@ with pkgs;
retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
retroshare06 = 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 { }; ripser = callPackage ../applications/science/math/ripser { };
@ -17287,7 +17287,7 @@ with pkgs;
tribler = callPackage ../applications/networking/p2p/tribler { }; 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 { }; tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { };
@ -17487,7 +17487,7 @@ with pkgs;
vnstat = callPackage ../applications/networking/vnstat { }; vnstat = callPackage ../applications/networking/vnstat { };
vogl = qt56.callPackage ../development/tools/vogl { }; vogl = libsForQt5.callPackage ../development/tools/vogl { };
volnoti = callPackage ../applications/misc/volnoti { }; volnoti = callPackage ../applications/misc/volnoti { };