Unverified Commit 8eabb500 authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #211399 from mislavzanic/mislavzanic/openshot-qt-3.0.0 

openshot-qt: 2.6.1 -> 3.0.0
parents 44fc962f 7f145286

pkgs/applications/video/openshot-qt/default.nix

+2 −18
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ 


mkDerivationWith python3.pkgs.buildPythonApplication rec {

  pname = "openshot-qt";

  version = "2.6.1";

  version = "3.0.0";



  src = fetchFromGitHub {

    owner = "OpenShot";

    repo = "openshot-qt";

    rev = "v${version}";

    hash = "sha256-29fAg4SDoAFzv6q43Dcs2HdaeKZfPEzlGqCcICiPSF0=";

    hash = "sha256-h4R2txi038m6tzdKYiXIB8CiqWt2MFFRNerp1CFP5as=";

  };



  nativeBuildInputs = [
@@ -45,22 +45,6 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { 
    export HOME=$(mktemp -d)

  '';



  # Following Arch PKGBUILD for Python 3.10 compatibility

  # https://github.com/OpenShot/openshot-qt/issues/4608

  # https://github.com/archlinux/svntogit-community/commits/packages/openshot/trunk

  patches = [

    (fetchpatch {

      name = "video-widget.patch";

      url = "https://github.com/OpenShot/openshot-qt/commit/9748a13268d66a5949aebc970637b5903756d018.patch";

      hash = "sha256-QwLtcooDJeYWDp80a1dUFo2so/zEWqqsq5IgkXWX324=";

    })

    (fetchpatch {

      name = "python-3.10-int.patch";

      url = "https://github.com/OpenShot/openshot-qt/commit/fff785eb1e3e0c30ed6ca57e2d1933aaa807ae22.patch";

      hash = "sha256-ee/s7rhF71ot5oPkGK+j59mL1B3e72xoH27KFoDL8s8=";

    })

  ];



  doCheck = false;



  dontWrapGApps = true;

pkgs/applications/video/openshot-qt/libopenshot.nix

+2 −2
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 


stdenv.mkDerivation rec {

  pname = "libopenshot";

  version = "0.2.7";

  version = "0.3.0";



  src = fetchFromGitHub {

    owner = "OpenShot";

    repo = "libopenshot";

    rev = "v${version}";

    sha256 = "sha256-aF8wrPxFIjCy5gw72e/WyL/Wcx9tUGDkrqHS+ZDVK0U=";

    sha256 = "sha256-qe866gFhcbd7yCNXDiZ9Aj0TAiWoJ+r7C5BjtWBKSGA=";

  };



  postPatch = ''