photoqt: use wrapQtProgram
This commit is contained in:
parent
bac36baf5b
commit
d2fec0a922
@ -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 = {
|
||||
|
Loading…
Reference in New Issue
Block a user