diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 15:38:25 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 16:09:40 +0300 |
| commit | d2fec0a9220eb76e9fb586229f1606ca347a4122 (patch) | |
| tree | af02cd9c8d201daacb9de07e0951fb07bd075aed /pkgs/applications/graphics/photoqt | |
| parent | bac36baf5bca7509fc1c5e6981521148c14b1057 (diff) | |
| download | nixpkgs-d2fec0a9220eb76e9fb586229f1606ca347a4122.tar nixpkgs-d2fec0a9220eb76e9fb586229f1606ca347a4122.tar.gz nixpkgs-d2fec0a9220eb76e9fb586229f1606ca347a4122.tar.bz2 nixpkgs-d2fec0a9220eb76e9fb586229f1606ca347a4122.tar.lz nixpkgs-d2fec0a9220eb76e9fb586229f1606ca347a4122.tar.xz nixpkgs-d2fec0a9220eb76e9fb586229f1606ca347a4122.tar.zst nixpkgs-d2fec0a9220eb76e9fb586229f1606ca347a4122.zip | |
photoqt: use wrapQtProgram
Diffstat (limited to 'pkgs/applications/graphics/photoqt')
| -rw-r--r-- | pkgs/applications/graphics/photoqt/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 9d68a44821a..f9b24581929 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,14 +1,9 @@ -{ stdenv, fetchurl, cmake, makeWrapper, exiv2, graphicsmagick +{ stdenv, fetchurl, cmake, makeQtWrapper, exiv2, graphicsmagick , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools }: let version = "1.3"; - qmlPath = stdenv.lib.makeSearchPath "lib/qt5/qml/" [ - qtquickcontrols - qtdeclarative - qtmultimedia - ]; in stdenv.mkDerivation rec { name = "photoqt-${version}"; @@ -18,7 +13,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake makeWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick + cmake makeQtWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick + qtmultimedia qtdeclarative ]; preConfigure = '' @@ -26,7 +22,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/photoqt --set QML2_IMPORT_PATH "${qmlPath}" + wrapQtProgram $out/bin/photoqt ''; meta = { |