diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2021-05-08 11:57:41 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-08 11:57:41 -0300 |
| commit | f7ad86329fa337fda05c9790084cf6a421fae223 (patch) | |
| tree | 1e6615c8056fc686a7c0036f08edbb85355b1ea0 /pkgs | |
| parent | 51b9941ba829d8176a9424bcc22461c92f9e86bf (diff) | |
| parent | 9ec2262fcb1a4a2d583913ee63b37b3861c628a3 (diff) | |
Merge pull request #122151 from ryantm/dvdstyler
dvdstyler: unbreak
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/dvdstyler/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/video/xine-ui/default.nix | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 83c38b933dd41..81f3cac73e19d 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -6,11 +6,14 @@ , docbook5 , dvdauthor , dvdplusrwtools +, ffmpeg , flex , fontconfig , gettext +, libexif , makeWrapper , pkg-config +, wxGTK30 , wxSVG , xine-ui , xmlto @@ -42,11 +45,14 @@ in stdenv.mkDerivation rec { docbook5 dvdauthor dvdplusrwtools + ffmpeg flex fontconfig gettext + libexif makeWrapper wxSVG + wxGTK30 xine-ui xmlto zip @@ -67,6 +73,8 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}" ''; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://www.dvdstyler.org/"; description = "A DVD authoring software"; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 0a206befaf107..ed60fad56c3b7 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { xorgproto ]); - postPatch = "sed -e '/curl\/types\.h/d' -i src/xitk/download.c"; - configureFlags = [ "--with-readline=${readline.dev}" ]; LIRC_CFLAGS="-I${lirc}/include"; |