diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-07 22:58:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 22:58:57 +0100 |
| commit | 14121941b117a5d6523c3d907da6d679914e4c5a (patch) | |
| tree | 197156117ae83b11a9df7c149ee5ae07be17572b /pkgs | |
| parent | 647607d7090dae05de62c776d52033b8284db320 (diff) | |
| parent | d8306e18eaa89ed6caddfc311daeb904b7fe81eb (diff) | |
Merge pull request #108691 from B4dM4n/qmltermwidget-fix
qmltermwidget: fix build with gcc10
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qmltermwidget/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index ac2584573114..53e83182c2b0 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -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/" ''; |