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: a3070689aef6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b926503738cc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 5, 2020

  1. texstudio: fix qt wrapping and explicitly receive qt attributes (#73298) 

    (cherry picked from commit 4f9fae2)
    @gameboo @bjornfor
    gameboo authored and bjornfor committed Jan 5, 2020
    Copy the full SHA
    f99bc99 View commit details

  2. texstudio: fix missing xcb platform plugin error 

    (cherry picked from commit 8c42dba)
    @nek0 @bjornfor
    nek0 authored and bjornfor committed Jan 5, 2020
    Copy the full SHA
    b926503 View commit details
Showing with 6 additions and 5 deletions.
  1. +6 −5 pkgs/applications/editors/texstudio/default.nix
11 changes: 6 additions & 5 deletions pkgs/applications/editors/texstudio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, qt5, poppler, zlib, pkgconfig}:
{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtscript, qtsvg,
wrapQtAppsHook, poppler, zlib, pkgconfig }:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "texstudio";
version = "2.12.16";

@@ -11,12 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "0ck65fvz6mzfpqdb1ndgyvgxdnslrwhdr1swgck4gaghcrgbg3gq";
};

nativeBuildInputs = [ qt5.qmake pkgconfig ];
buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler zlib ];
nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ];
buildInputs = [ qtbase qtscript qtsvg poppler zlib ];

qmakeFlags = [ "NO_APPDATA=True" ];

meta = with stdenv.lib; {
meta = with lib; {
description = "TeX and LaTeX editor";
longDescription=''
Fork of TeXMaker, this editor is a full fledged IDE for