diff options
| -rw-r--r-- | pkgs/applications/graphics/qview/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/applications/networking/seafile-client/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/games/qgo/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tikzit/default.nix | 6 |
4 files changed, 23 insertions, 14 deletions
diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index 8df6ce4f80b..b6f25795665 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -1,18 +1,27 @@ -{stdenv, fetchFromGitHub, qmake}: -stdenv.mkDerivation rec { +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }: + +mkDerivation rec { pname = "qview"; version = "3.0"; + src = fetchFromGitHub { owner = "jurplel"; repo = "qView"; rev = version; sha256 = "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7"; }; + nativeBuildInputs = [ qmake ]; + + buildInputs = [ + qtbase + ]; + patchPhase = '' sed "s|/usr/|$out/|g" -i qView.pro ''; - meta = with stdenv.lib; { + + meta = with lib; { description = "Practical and minimal image viewer"; homepage = "https://interversehq.com/qview/"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 1b96e9fb663..75ba68db3a8 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools , seafile-shared, ccnet, jansson, libsearpc , withShibboleth ? true, qtwebengine }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "seafile-client"; version = "7.0.5"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; qtWrapperArgs = [ - "--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}" + "--suffix PATH : ${lib.makeBinPath [ ccnet seafile-shared ]}" ]; meta = with lib; { diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index 610be7efdce..17441d14e7c 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -1,17 +1,17 @@ -{ stdenv +{ lib +, mkDerivation , fetchFromGitHub -, makeWrapper , qmake , qtbase , qtmultimedia , qttranslations }: -stdenv.mkDerivation { +mkDerivation { pname = "qgo"; version = "unstable-2017-12-18"; - meta = with stdenv.lib; { + meta = with lib; { description = "A Go client based on Qt5"; longDescription = '' qGo is a Go Client based on Qt 5. It supports playing online at @@ -41,7 +41,7 @@ stdenv.mkDerivation { postPatch = '' sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h ''; - nativeBuildInputs = [ makeWrapper qmake ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtmultimedia qttranslations ]; enableParallelBuilding = true; diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index 5ee1adda483..0a1f6591b86 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }: -stdenv.mkDerivation { +mkDerivation { pname = "tikzit"; version = "2.1.4"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ qmake qttools flex bison ]; - buildInputs = [ qtbase libsForQt5.poppler ]; + buildInputs = [ qtbase poppler ]; # src/data/tikzlexer.l:29:10: fatal error: tikzparser.parser.hpp: No such file or directory enableParallelBuilding = false; |