diff options
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/byzanz/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/clapper/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/coriander/default.nix | 45 | ||||
-rw-r--r-- | pkgs/applications/video/dvdstyler/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/freetube/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/video/memento/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/rtabmap/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/shotcut/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/timelens/default.nix | 2 |
11 files changed, 14 insertions, 66 deletions
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index bc88c24814678..a19f03727023b 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -3,7 +3,7 @@ , wrapGAppsHook3 , cairo , glib -, gnome +, gnome-common , gst_all_1 , gtk3 , intltool @@ -37,7 +37,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ which - gnome.gnome-common + gnome-common glib libtool cairo diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 78bfaa2b46373..12a66c90e8d54 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clapper"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Rafostar"; repo = "clapper"; rev = finalAttrs.version; - hash = "sha256-5fD1OnVcY3ZC+QfoFqe2jV43/J36r85SpLUYF2ti7dY="; + hash = "sha256-IQJTnLB6FzYYPONOqBkvi89iF0U6fx/aWYvNOOJpBvc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix deleted file mode 100644 index 80892b96c94b6..0000000000000 --- a/pkgs/applications/video/coriander/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, glib -, gtk2 -, libgnomeui -, libXv -, libraw1394 -, libdc1394 -, SDL -, automake -, GConf -}: - -stdenv.mkDerivation rec { - pname = "coriander"; - version = "2.0.1"; - - src = fetchurl { - url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-${version}.tar.gz"; - sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5"; - }; - - # Workaround build failure on -fno-common toolchains: - # ld: subtitles.o:src/coriander.h:110: multiple definition of - # `main_window'; main.o:src/coriander.h:110: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure = '' - cp ${automake}/share/automake-*/mkinstalldirs . - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; - - meta = { - homepage = "https://damien.douxchamps.net/ieee1394/coriander/"; - description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ viric ]; - platforms = with lib.platforms; linux; - mainProgram = "coriander"; - }; -} diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index db3f6e7f9a54e..ec15a47090fdb 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -24,7 +24,6 @@ , zip , dvdisasterSupport ? true, dvdisaster ? null -, thumbnailSupport ? true, libgnomeui ? null , udevSupport ? true, udev ? null , dbusSupport ? true, dbus ? null }: @@ -72,8 +71,7 @@ in stdenv.mkDerivation rec { ] ++ optionals dvdisasterSupport [ dvdisaster ] ++ optionals udevSupport [ udev ] - ++ optionals dbusSupport [ dbus ] - ++ optionals thumbnailSupport [ libgnomeui ]; + ++ optionals dbusSupport [ dbus ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 72bdd1f97916e..1f21fabb78f96 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.freetube; appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; + inherit pname version src; }; dontUnpack = true; diff --git a/pkgs/applications/video/memento/default.nix b/pkgs/applications/video/memento/default.nix index 0c993de2fcaba..1f6981215d39b 100644 --- a/pkgs/applications/video/memento/default.nix +++ b/pkgs/applications/video/memento/default.nix @@ -16,13 +16,13 @@ , makeWrapper}: stdenv.mkDerivation (finalAttrs: { pname = "memento"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "ripose-jp"; repo = "Memento"; rev = "v${finalAttrs.version}"; - hash = "sha256-/lgjzR2KwlIUMHSz3afBQEy+8kdKAI37kqTuq3r3qMk="; + hash = "sha256-3WOtf7cgYxAMlNPSBmTzaQF1HN9mU61giLp2woBAidY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 418d9adf8263b..82b557d449e17 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -48,8 +48,6 @@ , nlohmann_json , websocketpp , asio -, decklinkSupport ? false -, blackmagic-desktop-video , libdatachannel , libvpl , qrcodegencpp @@ -167,8 +165,6 @@ stdenv.mkDerivation (finalAttrs: { xorg.libX11 libvlc libGL - ] ++ optionals decklinkSupport [ - blackmagic-desktop-video ]; in '' # Remove libcef before patchelf, otherwise it will fail diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index c43b823dd7f81..5f47c666078c4 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-RBsdYG73SoX+dB4sUq641SL0ETUFE+PVAmr/DaqMuLI="; + sha256 = "sha256-4BmTp/PrR01H9IrKNX9ZpK4kLaiNG/G9rTMf9dsoV0s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index 3b457530fbf29..a720e672c783d 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "Real-Time Appearance-Based 3D Mapping"; homepage = "https://introlab.github.io/rtabmap/"; license = licenses.bsd3; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 710ca4395e084..61c6684a2f823 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "24.06.02"; + version = "24.06.26"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${finalAttrs.version}"; - hash = "sha256-zqP3xGaNx6z3DdEyKZTauXGTY16dZPL/2+gKtgdx4Y8="; + hash = "sha256-9eQF3s4BAUK81/94z7cMkd2NWdNLVMraP08qsDmuAI8="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/video/timelens/default.nix b/pkgs/applications/video/timelens/default.nix index b80d1c3c447b8..2124813f417fd 100644 --- a/pkgs/applications/video/timelens/default.nix +++ b/pkgs/applications/video/timelens/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://timelens.blinry.org"; changelog = "https://github.com/timelens/timelens/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "timelens"; }; } |