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

Commits on Mar 27, 2019

  1. qtikz: fix build 

    qcollectiongenerator was merged into qhelpgenerator in qt 5.12,
see https://blog.qt.io/blog/2018/11/02/whats-new-qt-help/
    @xeji
    xeji committed Mar 27, 2019
    Copy the full SHA
    0b8d40a View commit details

Commits on Mar 28, 2019

  1. Merge pull request #58459 from xeji/p/qtikz 

    qtikz: fix build
    @infinisil
    infinisil authored Mar 28, 2019
    Copy the full SHA
    32d67ef View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/graphics/ktikz/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/ktikz/default.nix
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
# lrelease command:
LRELEASECOMMAND = lrelease
# qcollectiongenerator command:
#QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator
QCOLLECTIONGENERATORCOMMAND = qhelpgenerator
# TikZ documentation default file path:
TIKZ_DOCUMENTATION_DEFAULT = @out@/share/doc/texmf/pgf/pgfmanual.pdf.gz