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

Merge pull request #122151 from ryantm/dvdstyler

Browse Source 
dvdstyler: unbreak
This commit is contained in:
Anderson Torres 2021-05-08 11:57:41 -03:00 committed by GitHub
commit f7ad86329f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/video/dvdstyler/default.nix
View File

@ -6,11 +6,14 @@
, docbook5 , docbook5
, dvdauthor , dvdauthor
, dvdplusrwtools , dvdplusrwtools
, ffmpeg
, flex , flex
, fontconfig , fontconfig
, gettext , gettext
, libexif
, makeWrapper , makeWrapper
, pkg-config , pkg-config
, wxGTK30
, wxSVG , wxSVG
, xine-ui , xine-ui
, xmlto , xmlto
@ -42,11 +45,14 @@ in stdenv.mkDerivation rec {
docbook5 docbook5
dvdauthor dvdauthor
dvdplusrwtools dvdplusrwtools
ffmpeg
flex flex
fontconfig fontconfig
gettext gettext
libexif
makeWrapper makeWrapper
wxSVG wxSVG
wxGTK30
xine-ui xine-ui
xmlto xmlto
zip zip
@ -67,6 +73,8 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}" wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}"
''; '';
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
homepage = "https://www.dvdstyler.org/"; homepage = "https://www.dvdstyler.org/";
description = "A DVD authoring software"; description = "A DVD authoring software";

2
pkgs/applications/video/xine-ui/default.nix
View File

@ -46,8 +46,6 @@ stdenv.mkDerivation rec {
xorgproto xorgproto
]); ]);
postPatch = "sed -e '/curl\/types\.h/d' -i src/xitk/download.c";
configureFlags = [ "--with-readline=${readline.dev}" ]; configureFlags = [ "--with-readline=${readline.dev}" ];
LIRC_CFLAGS="-I${lirc}/include"; LIRC_CFLAGS="-I${lirc}/include";