From 4f1e3592e29d508b0ce79e96c41df7926d024449 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 7 May 2021 20:01:48 -0700 Subject: [PATCH 1/2] xine-ui: unbreak --- pkgs/applications/video/xine-ui/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 0a206befaf10..ed60fad56c3b 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"; From 9ec2262fcb1a4a2d583913ee63b37b3861c628a3 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 7 May 2021 20:32:20 -0700 Subject: [PATCH 2/2] dvdstyler: unbreak It still has errors relating to GConf detection, but it seems to work. --- pkgs/applications/video/dvdstyler/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 83c38b933dd4..81f3cac73e19 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";