git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68592 from mat8913/lyx-wrapQtAppsHook

lyx: use qt5's mkDerivation

commit4b31dbba5fb5dc60a63038ba2c13e89546a16af9 authorworldofpeace <worldofpeace@protonmail.ch> dateThu 12 Sep 2019, 13:07 (7 years ago) parentdc64478b918bb9
1 file changed+6−7
pkgs/applications/misc/lyx/default.nix+6−7
pkgs/applications/misc/lyx/default.nix+6−7
@@ -1,8 +1,8 @@
1−{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch
1+{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc, fetchpatch
22, qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
33}:
44
5−stdenv.mkDerivation rec {
5+mkDerivation rec {
66 version = "2.3.0";
77 pname = "lyx";
88
@@ -30,10 +30,9 @@ stdenv.mkDerivation rec {
3030 doCheck = true;
3131
3232 # python is run during runtime to do various tasks
33− postFixup = ''
34− wrapProgram "$out/bin/lyx" \
35− --prefix PATH : '${python}/bin'
36− '';
33+ qtWrapperArgs = [
34+ " --prefix PATH : ${python}/bin"
35+ ];
3736
3837 patches = [
3938 (fetchpatch {
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
4241 })
4342 ];
4443
45− meta = with stdenv.lib; {
44+ meta = with lib; {
4645 description = "WYSIWYM frontend for LaTeX, DocBook";
4746 homepage = http://www.lyx.org;
4847 license = licenses.gpl2Plus;