From fefda2dd989bcb93eb492317a129aef6d8008147 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 23 Oct 2020 22:33:04 -0300 Subject: [PATCH] bombono: update expression - New github page - Update license - Update homepage --- pkgs/applications/video/bombono/default.nix | 78 ++++++++++++++------- 1 file changed, 52 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 2ae3722fff2e..05ba5ef19be7 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -1,54 +1,80 @@ -{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gtkmm2, scons, -mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg_3, -enca, pkgconfig, fetchpatch }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, fetchpatch +, scons +, boost +, dvdauthor +, dvdplusrwtools +, enca +, ffmpeg_3 +, gettext +, gtk2 +, gtkmm2 +, libdvdread +, libxmlxx +, mjpegtools +, wrapGAppsHook +}: -let fetchPatchFromAur = {name, sha256}: -fetchpatch { - inherit name sha256; - url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c"; -}; in +let + fetchPatchFromAur = {name, sha256}: + fetchpatch { + inherit name sha256; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c"; + }; +in stdenv.mkDerivation rec { pname = "bombono"; version = "1.2.4"; + src = fetchFromGitHub { - owner = "muravjov"; + owner = "bombono-dvd"; repo = "bombono-dvd"; rev = version; - sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9"; + sha256 = "sha256-aRW8H8+ca/61jGLxUs7u3R7yEiulwr5viMEuZWbc4dM="; }; patches = [ (fetchpatch { name = "bombono-dvd-1.2.4-scons3.patch"; url = "https://svnweb.mageia.org/packages/cauldron/bombono-dvd/current/SOURCES/bombono-dvd-1.2.4-scons-python3.patch?revision=1447925&view=co&pathrev=1484457"; - sha256 = "081116d0if6s2r1rgqfr1n5gl3kpvzk01pf4v2k7gg2rnid83qp4"; + sha256 = "sha256-5OKBWrRZvHem2MTdAObfdw76ig3Z4ZdDFtq4CJoJISA="; }) ] ++ (map fetchPatchFromAur [ - {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";} - {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";} - {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";} - {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";} - {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";} - {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";} - {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";} - {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";} + {name="fix_ffmpeg_codecid.patch"; sha256="sha256-58L+1BJy5HK/R+xALbq2z4+Se4i6yp21lo/MjylgTqs=";} + {name="fix_ptr2bool_cast.patch"; sha256="sha256-DyqMw/m2Op9+gBq1CTCjSZ1qM9igV5Y6gTOi8VbNH0c=";} + {name="fix_c++11_literal_warnings.patch"; sha256="sha256-iZ/CN5+xg7jPXl5r/KGCys+jyPu0/AsSABLcc6IIbv0=";} + {name="autoptr2uniqueptr.patch"; sha256="sha256-teGp6uICB4jAJk18pdbBMcDxC/JJJGkdihtXeh3ffCg=";} + {name="fix_deprecated_boost_api.patch"; sha256="sha256-qD5QuO/ndEU1N7vueQiNpPVz8OaX6Y6ahjCWxMdvj6A=";} + {name="fix_throw_specifications.patch"; sha256="sha256-NjCDGwXRCSLcuW2HbPOpXRgNvNQHy7i7hoOgyvGIr7g=";} + {name="fix_operator_ambiguity.patch"; sha256="sha256-xx7WyrxEdDrDuz5YoFrM/u2qJru9u6X/4+Y5rJdmmmQ=";} + {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";} ]); nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; buildInputs = [ - gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools - libxmlxx ffmpeg_3 enca - ]; + boost + dvdauthor + dvdplusrwtools + enca + ffmpeg_3 + gtk2 + gtkmm2 + libdvdread + libxmlxx + mjpegtools + ]; prefixKey = "PREFIX="; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "a DVD authoring program for personal computers"; - homepage = "http://www.bombono.org/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ symphorien ]; + homepage = "https://www.bombono.org/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ symphorien ]; }; }