diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2020-10-22 12:25:26 +0200 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2020-10-24 02:02:09 +0200 |
| commit | 38c52994a6334fb37b9009a638b1e5904ca4cb7f (patch) | |
| tree | 8e32942855889f163aeadd436824699e1d069e3d /pkgs/applications/video/pitivi | |
| parent | 9ba3714f10eb51d79f67f1db36efea1d54c05634 (diff) | |
pitivi: 0.999 -> 2020.09.1
Diffstat (limited to 'pkgs/applications/video/pitivi')
| -rw-r--r-- | pkgs/applications/video/pitivi/default.nix | 45 |
1 files changed, 4 insertions, 41 deletions
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 36de120fb6a7..535913c6f2b2 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , fetchurl -, fetchpatch , pkg-config , gettext , itstool @@ -11,6 +10,7 @@ , gst_all_1 , gtk3 , gobject-introspection +, libpeas , librsvg , gnome3 , libnotify @@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec { pname = "pitivi"; - version = "0.999"; + version = "2020.09.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb"; + sha256 = "1by52b56s9c3h23n40iccygkazwlhii2gb28zhnj2xz5805j05y2"; }; patches = [ @@ -36,41 +36,6 @@ python3Packages.buildPythonApplication rec { # and saves them to the generated binary. This would make the build-time # dependencies part of the closure so we remove it. ./prevent-closure-contamination.patch - - # Port from intltool to gettext. - # Needed for the following patches to apply. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/commit/89b1053f2516c594f414c5c67c835471bce44b67.patch"; - sha256 = "8yhArzAtZC+WjHftcSDrstBlT8j6WlGHffU9Nj+ny+c="; - excludes = [ "po/POTFILES.in" ]; - }) - - # Compatibility with using gst-transcoder from gst-plugins-bad. - # TODO Remove with version 2020.09 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/commit/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch"; - sha256 = "zxJm+E5o+oZ3lW6wYNY/ERo2g4NmCjoY8oV+uScq8j8="; - }) - - # Generate renderer.so on macOS instead of dylib. - # Needed for the following patch to apply. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/commit/bcacadcafabf8911efb0fddc8d57329237d08cd1.patch"; - sha256 = "2BM5acIwOgdr1L9vhtMMN4trrLuqCg/K6v6ZYtD1Fjw="; - postFetch = '' - sed -i -e "s/1.90.0.1/0.999/g" "$out" - ''; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/commit/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch"; - sha256 = "6DhqRlxFWFFdLwGoFem+vPt8x7v732KMVjMF9fypMK4="; - postFetch = '' - sed "$out" -i \ - -e "s/1.90.0.1/0.999/g" \ - -e "s/\(-python_dep.*\)/\1\n /" \ - -e "s/-1,9 +1,16/-1,10 +1,17/" - ''; - }) ]; nativeBuildInputs = [ @@ -86,6 +51,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 + libpeas librsvg gnome3.gnome-desktop gsound @@ -115,9 +81,6 @@ python3Packages.buildPythonApplication rec { postPatch = '' patchShebangs ./getenvvar.py - - # fetchpatch does not support renamings - mv data/org.pitivi.Pitivi-mime.xml data/org.pitivi.Pitivi-mime.xml.in ''; # Fixes error |