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

vogl: Fix build with qt59

Browse Source
This commit is contained in:
adisbladis 2018-01-11 18:38:23 +08:00
parent 5f232de6cd
commit 33ec57356a
No known key found for this signature in database
GPG Key ID: ED58F95069B004F5
2 changed files with 10 additions and 1 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 = [

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

@ -17485,7 +17485,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 { };