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

Merge pull request #68592 from mat8913/lyx-wrapQtAppsHook

Browse Source 
lyx: use qt5's mkDerivation
This commit is contained in:
worldofpeace 2019-09-12 13:07:07 -04:00 committed by GitHub
commit 4b31dbba5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/misc/lyx/default.nix
View File

@ -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 , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
version = "2.3.0"; version = "2.3.0";
pname = "lyx"; pname = "lyx";
@ -30,10 +30,9 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
# python is run during runtime to do various tasks # python is run during runtime to do various tasks
postFixup = '' qtWrapperArgs = [
wrapProgram "$out/bin/lyx" \ " --prefix PATH : ${python}/bin"
--prefix PATH : '${python}/bin' ];
'';
patches = [ patches = [
(fetchpatch { (fetchpatch {
@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
}) })
]; ];
meta = with stdenv.lib; { meta = with lib; {
description = "WYSIWYM frontend for LaTeX, DocBook"; description = "WYSIWYM frontend for LaTeX, DocBook";
homepage = http://www.lyx.org; homepage = http://www.lyx.org;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;