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: a06952dbb1cf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9f6b441aecfc
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 1, 2019

  1. pfstools: port to qt5 (#33248) 

    Since release 2.1.0 pfsview supports qt5.
    @pSub
    pSub committed Feb 1, 2019
    Copy the full SHA
    9f6b441 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/tools/graphics/pfstools/default.nix
4 changes: 2 additions & 2 deletions pkgs/tools/graphics/pfstools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig
, openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat
, fftw, gsl, libexif, perl, opencv, qt4
, fftw, gsl, libexif, perl, opencv, qt5
}:

stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
openexr zlib imagemagick libGLU_combined freeglut fftwFloat
fftw gsl libexif perl opencv qt4
fftw gsl libexif perl opencv qt5.qtbase
];

patches = [ ./threads.patch ./pfstools.patch ];