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

Commits on Oct 22, 2019

  1. texmaker: use qt5 mkDerivation

    @cruegge
    cruegge committed Oct 22, 2019
    Copy the full SHA
    adf8119 View commit details

  2. texmaker: avoid shell expansion when setting qmakeFlags

    @cruegge
    cruegge committed Oct 22, 2019
    Copy the full SHA
    97f734a View commit details

  3. Merge pull request #71675 from cruegge/texmaker-wrapqtappshook 

    texmaker: use wrapQtAppsHook
    @markuskowa
    markuskowa authored Oct 22, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a51a718 View commit details
Showing with 8 additions and 7 deletions.
  1. +8 −7 pkgs/applications/editors/texmaker/default.nix
15 changes: 8 additions & 7 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";

@@ -13,14 +13,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig poppler qmake ];
NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";

preConfigure = ''
qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps METAINFODIR=$out/share/metainfo"
'';

qmakeFlags = [
"DESKTOPDIR=${placeholder "out"}/share/applications"
"ICONDIR=${placeholder "out"}/share/pixmaps"
"METAINFODIR=${placeholder "out"}/share/metainfo"
];

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