From e8e7b8d94fa947ad227c49509b9c356081f8da75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 11 Nov 2019 22:08:39 -0300 Subject: [PATCH] deepin.deepin-movie-reborn: 3.2.24 -> 5.0.0 --- .../deepin/deepin-movie-reborn/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 046f589263bd..0c14ddff178f 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -1,16 +1,16 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, qttools, qtx11extras, dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, libdvdnav, libdvdread, xorg, deepin }: mkDerivation rec { pname = "deepin-movie-reborn"; - version = "3.2.24"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "16mxym7dm6qk90q2w7xqm62047rq0lirrjmnnpaxshzaww9gngkh"; + sha256 = "0cly8q0514a58s3h3wsvx9yxar7flz6i2q8xkrkfjias22b3z7b0"; }; outputs = [ "out" "dev" ]; @@ -19,6 +19,7 @@ mkDerivation rec { cmake pkgconfig qttools + deepin.setupHook ]; buildInputs = [ @@ -37,11 +38,24 @@ mkDerivation rec { xorg.xcbproto ]; + patches = [ + # fix: build failed if cannot find dtk-settings tool + (fetchpatch { + url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/fbb307b.patch"; + sha256 = "0915za0khki0729rvcfpxkh6vxhqwc47cgcmjc90kfq1004221vx"; + }) + ]; + NIX_LDFLAGS = "-ldvdnav"; + postPatch = '' - sed -i src/CMakeLists.txt -e "s,/usr/lib/dtk2,${dtkcore}/lib/dtk2," + searchHardCodedPaths # debugging + sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' + + substituteInPlace src/deepin-movie.desktop \ + --replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie" ''; passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };