b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #108691 from B4dM4n/qmltermwidget-fix

Browse source 
qmltermwidget: fix build with gcc10
This commit is contained in:
Sandro 2021-01-07 22:58:57 +01:00 committed by GitHub
parent 647607d709 d8306e18ea
commit 14121941b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/libraries/qmltermwidget/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:
{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }:
stdenv.mkDerivation {
version = "2018-11-24";
@ -15,7 +15,15 @@ stdenv.mkDerivation {
++ stdenv.lib.optional stdenv.isDarwin utmp;
nativeBuildInputs = [ qmake ];
patchPhase = ''
patches = [
(fetchpatch {
name = "fix-missing-includes.patch";
url = "https://github.com/Swordfish90/qmltermwidget/pull/27/commits/485f8d6d841b607ba49e55a791f7f587e4e193bc.diff";
sha256 = "186s8pv3642vr4lxsds919h0y2vrkl61r7wqq9mc4a5zk5vprinj";
})
];
postPatch = ''
substituteInPlace qmltermwidget.pro \
--replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/"
'';