diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-12 13:07:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 13:07:07 -0400 |
| commit | 4b31dbba5fb5dc60a63038ba2c13e89546a16af9 (patch) | |
| tree | 8ad6353127ee9ddad571f9e434b42dd59ff9fc52 /pkgs/applications | |
| parent | dc6447812b508c7857ed6419168ef068c98cdc58 (diff) | |
| parent | b918bb9e5d204fbdb83a4b82c520461cc6cd155c (diff) | |
| download | nixlib-4b31dbba5fb5dc60a63038ba2c13e89546a16af9.tar nixlib-4b31dbba5fb5dc60a63038ba2c13e89546a16af9.tar.gz nixlib-4b31dbba5fb5dc60a63038ba2c13e89546a16af9.tar.bz2 nixlib-4b31dbba5fb5dc60a63038ba2c13e89546a16af9.tar.lz nixlib-4b31dbba5fb5dc60a63038ba2c13e89546a16af9.tar.xz nixlib-4b31dbba5fb5dc60a63038ba2c13e89546a16af9.tar.zst nixlib-4b31dbba5fb5dc60a63038ba2c13e89546a16af9.zip | |
Merge pull request #68592 from mat8913/lyx-wrapQtAppsHook
lyx: use qt5's mkDerivation
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/lyx/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 744d124f84d5..f7964e4e5c6d 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,8 +1,8 @@ -{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch +{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc, fetchpatch , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "2.3.0"; pname = "lyx"; @@ -30,10 +30,9 @@ stdenv.mkDerivation rec { doCheck = true; # python is run during runtime to do various tasks - postFixup = '' - wrapProgram "$out/bin/lyx" \ - --prefix PATH : '${python}/bin' - ''; + qtWrapperArgs = [ + " --prefix PATH : ${python}/bin" + ]; patches = [ (fetchpatch { @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = http://www.lyx.org; license = licenses.gpl2Plus; |