Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1a7c6e6f918c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 56c4063ce6b7
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Oct 22, 2019

  1. qscintilla: Fix qt4 build 

    (cherry picked from commit eb1cd0d)
    @lsix @das-g
    lsix authored and das-g committed Oct 22, 2019
    Copy the full SHA
    f64135e View commit details

  2. qscintilla: fix qt4-fix patch header 

    after backporting from master to release-19.09
    @das-g
    das-g committed Oct 22, 2019
    Copy the full SHA
    9967d27 View commit details

  3. Merge pull request #71646 from das-g/release-19.09_fix-qscintilla-qt4 

    qscintilla: Fix qt4 build
    @peterhoeg
    peterhoeg authored Oct 22, 2019
    Copy the full SHA
    c30a7d7 View commit details

  4. texmaker: use qt5 mkDerivation 

    (cherry picked from commit adf8119)
    @cruegge @markuskowa
    cruegge authored and markuskowa committed Oct 22, 2019

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    56c4063 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/editors/texmaker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }:
{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "texmaker";
version = "5.0.3";

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

meta = with stdenv.lib; {
meta = with lib; {
description = "TeX and LaTeX editor";
longDescription=''
This editor is a full fledged IDE for TeX and
3 changes: 2 additions & 1 deletion pkgs/development/libraries/qscintilla/default.nix
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;


patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ];
patches = (lib.optional (stdenv.isDarwin && withQt5) xcodePatch) ++
(lib.optional (!withQt5) ./fix-qt4-build.patch );

enableParallelBuilding = true;

11 changes: 11 additions & 0 deletions pkgs/development/libraries/qscintilla/fix-qt4-build.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff -ur QScintilla_gpl-2.9.4/Qt4Qt5/Qsci/qsciscintillabase.h QScintilla_gpl-2.9.4-fix/Qt4Qt5/Qsci/qsciscintillabase.h
--- QScintilla_gpl-2.9.4/Qt4Qt5/Qsci/qsciscintillabase.h 2016-12-25 23:01:54.000000000 +0100
+++ QScintilla_gpl-2.9.4-fix/Qt4Qt5/Qsci/qsciscintillabase.h 2019-10-22 09:07:55.429260135 +0200
@@ -31,6 +31,7 @@
#include <QByteArray>
#include <QPoint>
#include <QTimer>
+#include <QUrl>

#include <Qsci/qsciglobal.h>