diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-22 16:21:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 16:21:37 +0100 |
| commit | 6999dbfe42a3f4e68933bf15312f3af2310d5588 (patch) | |
| tree | 5ee3a3b8685e072f241d036c101b1ba5a3dbf978 /pkgs/applications/video | |
| parent | 41069d41dcfe90a44a15dc28a692ebee2caad573 (diff) | |
| parent | eed4bbb918b21b3b41dfb550bcb8827462fac794 (diff) | |
Merge pull request #144055 from austinbutler/kooha200
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/kooha/default.nix | 66 |
1 files changed, 44 insertions, 22 deletions
diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 6203041ed63eb..f5be866473903 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -1,28 +1,40 @@ -{ lib, fetchFromGitHub, appstream-glib, desktop-file-utils, glib -, gobject-introspection, gst_all_1, gtk4, libadwaita, librsvg, meson, ninja -, pkg-config, python3, wrapGAppsHook }: +{ lib +, stdenv +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, glib +, gobject-introspection +, gst_all_1 +, gtk4 +, libadwaita +, libpulseaudio +, librsvg +, meson +, ninja +, pkg-config +, python3 +, rustPlatform +, wayland +, wrapGAppsHook +}: -python3.pkgs.buildPythonApplication rec { +stdenv.mkDerivation rec { pname = "kooha"; - version = "1.2.1"; - format = "other"; + version = "2.0.1"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - sha256 = "1qwbzdn0n1nxcfci1bhhkfchdhw5yz74fdvsa84cznyyx2jils8w"; + sha256 = "05ynpwjdpl7zp9f17zhhvb59rbz3gd7hc0amla1g85ldgfxbgl00"; }; - buildInputs = [ - glib - gobject-introspection - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gtk4 - libadwaita - librsvg - ]; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256:16zf6vb001z7xdv2g4kpmb2vqsmaql2cpsx1rl9zrfhpl2z6frs9"; + }; nativeBuildInputs = [ appstream-glib @@ -31,21 +43,31 @@ python3.pkgs.buildPythonApplication rec { ninja python3 pkg-config + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wayland wrapGAppsHook ]; + buildInputs = [ + glib + gobject-introspection + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gtk4 + libadwaita + libpulseaudio + librsvg + ]; + propagatedBuildInputs = [ python3.pkgs.pygobject3 ]; strictDeps = false; - buildPhase = '' - export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - # Fixes https://github.com/NixOS/nixpkgs/issues/31168 postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py + patchShebangs build-aux/meson_post_install.py ''; installCheckPhase = '' |