From fee74012f203d4162260505b3cb79808b42e0378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Fri, 30 Aug 2019 01:46:27 +0200 Subject: [PATCH 1/2] nomace: use Qt mkDerivation --- pkgs/applications/graphics/nomacs/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index e4393726483..e955515d224 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -1,9 +1,8 @@ { stdenv +, mkDerivation , fetchFromGitHub , cmake , pkgconfig -, wrapGAppsHook -, gsettings-desktop-schemas , qtbase , qttools @@ -38,8 +37,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [cmake - pkgconfig - wrapGAppsHook]; + pkgconfig]; buildInputs = [qtbase qttools @@ -48,8 +46,7 @@ stdenv.mkDerivation rec { opencv libraw libtiff - quazip - gsettings-desktop-schemas]; + quazip]; cmakeFlags = ["-DENABLE_OPENCV=ON" "-DENABLE_RAW=ON" From 543b9048737dad37bee078d70957ce9ddce0b5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Fri, 30 Aug 2019 01:47:38 +0200 Subject: [PATCH 2/2] nomacs: enable translations --- pkgs/applications/graphics/nomacs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index e955515d224..fbf595f1537 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { "-DENABLE_RAW=ON" "-DENABLE_TIFF=ON" "-DENABLE_QUAZIP=ON" + "-DENABLE_TRANSLATIONS=ON" "-DUSE_SYSTEM_QUAZIP=ON"]; meta = with stdenv.lib; {