Merge pull request #67767 from B4dM4n/nomacs-wrap-qt

nomacs: build using Qt mkDerivation (+ translations)
This commit is contained in:
worldofpeace 2019-08-31 22:38:55 -04:00 committed by GitHub
commit b797fbcc26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,9 +1,8 @@
{ stdenv { stdenv
, mkDerivation
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, pkgconfig , pkgconfig
, wrapGAppsHook
, gsettings-desktop-schemas
, qtbase , qtbase
, qttools , qttools
@ -38,8 +37,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [cmake nativeBuildInputs = [cmake
pkgconfig pkgconfig];
wrapGAppsHook];
buildInputs = [qtbase buildInputs = [qtbase
qttools qttools
@ -48,13 +46,13 @@ stdenv.mkDerivation rec {
opencv opencv
libraw libraw
libtiff libtiff
quazip quazip];
gsettings-desktop-schemas];
cmakeFlags = ["-DENABLE_OPENCV=ON" cmakeFlags = ["-DENABLE_OPENCV=ON"
"-DENABLE_RAW=ON" "-DENABLE_RAW=ON"
"-DENABLE_TIFF=ON" "-DENABLE_TIFF=ON"
"-DENABLE_QUAZIP=ON" "-DENABLE_QUAZIP=ON"
"-DENABLE_TRANSLATIONS=ON"
"-DUSE_SYSTEM_QUAZIP=ON"]; "-DUSE_SYSTEM_QUAZIP=ON"];
meta = with stdenv.lib; { meta = with stdenv.lib; {