Merge pull request #211399 from mislavzanic/mislavzanic/openshot-qt-3.0.0
openshot-qt: 2.6.1 -> 3.0.0
This commit is contained in:
commit
8eabb500eb
|
@ -13,13 +13,13 @@
|
||||||
|
|
||||||
mkDerivationWith python3.pkgs.buildPythonApplication rec {
|
mkDerivationWith python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "openshot-qt";
|
pname = "openshot-qt";
|
||||||
version = "2.6.1";
|
version = "3.0.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "OpenShot";
|
owner = "OpenShot";
|
||||||
repo = "openshot-qt";
|
repo = "openshot-qt";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-29fAg4SDoAFzv6q43Dcs2HdaeKZfPEzlGqCcICiPSF0=";
|
hash = "sha256-h4R2txi038m6tzdKYiXIB8CiqWt2MFFRNerp1CFP5as=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -45,22 +45,6 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec {
|
||||||
export HOME=$(mktemp -d)
|
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;
|
doCheck = false;
|
||||||
|
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
|
@ -20,13 +20,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libopenshot";
|
pname = "libopenshot";
|
||||||
version = "0.2.7";
|
version = "0.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "OpenShot";
|
owner = "OpenShot";
|
||||||
repo = "libopenshot";
|
repo = "libopenshot";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-aF8wrPxFIjCy5gw72e/WyL/Wcx9tUGDkrqHS+ZDVK0U=";
|
sha256 = "sha256-qe866gFhcbd7yCNXDiZ9Aj0TAiWoJ+r7C5BjtWBKSGA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
Loading…
Reference in a new issue