From 3e6a70d9744db535208d522e003eed03cde2de31 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 20:21:18 -0600 Subject: [PATCH] phototonic: Qt 5 infrastructure update --- pkgs/applications/graphics/phototonic/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index f1a46b63d588..6803b969b4b5 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt5, exiv2 }: +{ stdenv, fetchFromGitHub, qtbase, exiv2 }: stdenv.mkDerivation rec { name = "phototonic-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1agd3bsrpljd019qrjvlbim5l0bhpx53dhpc0gvyn0wmcdzn92gj"; }; - buildInputs = [ qt5.base exiv2 ]; + buildInputs = [ qtbase exiv2 ]; configurePhase = '' sed -i 's;/usr;;' phototonic.pro diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 598d8640a134..b8472d7dfaa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12751,7 +12751,7 @@ let photoqt = qt5.callPackage ../applications/graphics/photoqt { }; - phototonic = callPackage ../applications/graphics/phototonic { }; + phototonic = qt5.callPackage ../applications/graphics/phototonic { }; pianobar = callPackage ../applications/audio/pianobar { };