diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2020-03-18 12:53:54 -0700 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-03-18 15:59:17 -0700 |
| commit | aaefb947eaa5f227feb99ea181bca6404c549d74 (patch) | |
| tree | 0daa6d855c644b7e7b6bcf7301e6dc8fbd411dd2 | |
| parent | 12be6698e8fc5dae1f16f59a66aa6cd5084cdf4b (diff) | |
| download | nixlib-aaefb947eaa5f227feb99ea181bca6404c549d74.tar nixlib-aaefb947eaa5f227feb99ea181bca6404c549d74.tar.gz nixlib-aaefb947eaa5f227feb99ea181bca6404c549d74.tar.bz2 nixlib-aaefb947eaa5f227feb99ea181bca6404c549d74.tar.lz nixlib-aaefb947eaa5f227feb99ea181bca6404c549d74.tar.xz nixlib-aaefb947eaa5f227feb99ea181bca6404c549d74.tar.zst nixlib-aaefb947eaa5f227feb99ea181bca6404c549d74.zip | |
texworks: fix qt build
| -rw-r--r-- | pkgs/applications/editors/texworks/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index f2bb9279c871..d5549c525928 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, qt5, libsForQt5, hunspell +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config +, qtscript, poppler, hunspell , withLua ? true, lua , withPython ? true, python3 }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "texworks"; version = "0.6.4"; @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { sha256 = "0d7f23c6c1wj4aii4h5w9piv01qfb69zrd79dvxwydrk99i8gnl4"; }; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt5.qtscript libsForQt5.poppler hunspell ] + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ qtscript poppler hunspell ] ++ lib.optional withLua lua ++ lib.optional withPython python3; cmakeFlags = lib.optional withLua "-DWITH_LUA=ON" ++ lib.optional withPython "-DWITH_PYTHON=ON"; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple TeX front-end program inspired by TeXShop"; homepage = "http://www.tug.org/texworks/"; license = licenses.gpl2Plus; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01a224f392a..60da1eeaf5b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6855,7 +6855,7 @@ in textadept = callPackage ../applications/editors/textadept { }; - texworks = callPackage ../applications/editors/texworks { }; + texworks = libsForQt5.callPackage ../applications/editors/texworks { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; |