public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #80982 from worldofpeace/qt-derivation-fixes

Browse Source 
various: use qt5's mkDerivation
This commit is contained in:
worldofpeace 2020-02-25 20:11:06 -05:00 committed by GitHub
commit 705afab44d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/graphics/qview/default.nix
View File

@ -1,18 +1,27 @@
{stdenv, fetchFromGitHub, qmake}: { mkDerivation, lib, fetchFromGitHub, qmake, qtbase }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "qview"; pname = "qview";
version = "3.0"; version = "3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jurplel"; owner = "jurplel";
repo = "qView"; repo = "qView";
rev = version; rev = version;
sha256 = "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7"; sha256 = "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [
qtbase
];
patchPhase = '' patchPhase = ''
sed "s|/usr/|$out/|g" -i qView.pro sed "s|/usr/|$out/|g" -i qView.pro
''; '';
meta = with stdenv.lib; {
meta = with lib; {
description = "Practical and minimal image viewer"; description = "Practical and minimal image viewer";
homepage = "https://interversehq.com/qview/"; homepage = "https://interversehq.com/qview/";
license = licenses.gpl3; license = licenses.gpl3;

6
pkgs/applications/networking/seafile-client/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools { mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
, seafile-shared, ccnet, jansson, libsearpc , seafile-shared, ccnet, jansson, libsearpc
, withShibboleth ? true, qtwebengine }: , withShibboleth ? true, qtwebengine }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "seafile-client"; pname = "seafile-client";
version = "7.0.5"; version = "7.0.5";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; ++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
qtWrapperArgs = [ qtWrapperArgs = [
"--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}" "--suffix PATH : ${lib.makeBinPath [ ccnet seafile-shared ]}"
]; ];
meta = with lib; { meta = with lib; {

10
pkgs/games/qgo/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv { lib
, mkDerivation
, fetchFromGitHub , fetchFromGitHub
, makeWrapper
, qmake , qmake
, qtbase , qtbase
, qtmultimedia , qtmultimedia
, qttranslations , qttranslations
}: }:
stdenv.mkDerivation { mkDerivation {
pname = "qgo"; pname = "qgo";
version = "unstable-2017-12-18"; version = "unstable-2017-12-18";
meta = with stdenv.lib; { meta = with lib; {
description = "A Go client based on Qt5"; description = "A Go client based on Qt5";
longDescription = '' longDescription = ''
qGo is a Go Client based on Qt 5. It supports playing online at qGo is a Go Client based on Qt 5. It supports playing online at
@ -41,7 +41,7 @@ stdenv.mkDerivation {
postPatch = '' postPatch = ''
sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h
''; '';
nativeBuildInputs = [ makeWrapper qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtmultimedia qttranslations ]; buildInputs = [ qtbase qtmultimedia qttranslations ];
enableParallelBuilding = true; enableParallelBuilding = true;

6
pkgs/tools/typesetting/tikzit/default.nix
View File

@ -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"; pname = "tikzit";
version = "2.1.4"; version = "2.1.4";
@ -12,7 +12,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ qmake qttools flex bison ]; 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 # src/data/tikzlexer.l:29:10: fatal error: tikzparser.parser.hpp: No such file or directory
enableParallelBuilding = false; enableParallelBuilding = false;