Merge pull request #253111 from kashw2/focuswriter
focuswriter: 1.7.6 -> 1.8.5
This commit is contained in:
commit
62e6823ff1
|
@ -1,24 +1,37 @@
|
|||
{ lib, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
, hunspell
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, qttools
|
||||
, qt5compat
|
||||
, qtwayland
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "focuswriter";
|
||||
version = "1.7.6";
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
|
||||
sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gottcode";
|
||||
repo = "focuswriter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6wvTlC/NCCcN2jpwqtoOsCln3ViY/vj7NpMsbYHBGiI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake qttools ];
|
||||
buildInputs = [ hunspell qtbase qtmultimedia ];
|
||||
nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ];
|
||||
buildInputs = [ hunspell qtbase qtmultimedia qt5compat qtwayland ];
|
||||
|
||||
qmakeFlags = [ "PREFIX=/" ];
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple, distraction-free writing environment";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ madjar ];
|
||||
maintainers = with maintainers; [ madjar kashw2 ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://gottcode.org/focuswriter/";
|
||||
};
|
||||
|
|
|
@ -31724,7 +31724,7 @@ with pkgs;
|
|||
|
||||
focus-stack = callPackage ../applications/graphics/focus-stack { };
|
||||
|
||||
focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { };
|
||||
focuswriter = qt6Packages.callPackage ../applications/editors/focuswriter { };
|
||||
|
||||
foliate = callPackage ../applications/office/foliate { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue