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

Commits on Jan 8, 2020

  1. photoqt: use qt5's mkDerivation

    @valencik @worldofpeace
    valencik authored and worldofpeace committed Jan 8, 2020
    Copy the full SHA
    787a7f6 View commit details

  2. Merge pull request #76433 from valencik/photoqt-qtwrap 

    photoqt: use qt5's mkDerivation
    @worldofpeace
    worldofpeace authored Jan 8, 2020

    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
    09863a6 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/graphics/photoqt/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/photoqt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch
{ mkDerivation, stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch
, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects
, extra-cmake-modules, poppler, kimageformats, libarchive, libdevil
}:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "photoqt";
version = "1.7.1";