Unverified Commit cb3226fd authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

entangle: fix build (#344986)

parents eca282a7 7db7e2f7

pkgs/applications/video/entangle/default.nix→pkgs/by-name/en/entangle/package.nix

+84 −78
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitLab

, fetchpatch

, itstool

, libxml2

, meson

, ninja

, perl

, python3

, pkgconf

, wrapGAppsHook3

, at-spi2-core

, dbus

, elfutils

, libepoxy

, gexiv2

, glib

, gobject-introspection

, gst-plugins-base

, gstreamer

, gtk3

, lcms2

, libdatrie

, libgphoto2

, libgudev

, libpeas

, libraw

, libselinux

, libsepol

, libthai

, libunwind

, libxkbcommon

, orc

, pcre

, pcre2

, udev

, util-linux

, xorg

, zstd

{

  lib,

  stdenv,

  fetchFromGitLab,

  fetchpatch,

  itstool,

  libxml2,

  meson,

  ninja,

  perl,

  python3,

  pkgconf,

  wrapGAppsHook3,

  at-spi2-core,

  dbus,

  elfutils,

  libepoxy,

  gexiv2,

  glib,

  gobject-introspection,

  gst_all_1,

  gtk3,

  lcms2,

  libdatrie,

  libgphoto2,

  libgudev,

  libpeas,

  libraw,

  libselinux,

  libsepol,

  lerc,

  libthai,

  libunwind,

  libxkbcommon,

  orc,

  pcre,

  pcre2,

  udev,

  util-linux,

  xorg,

  zstd,

  cmake,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "entangle";

  version = "3.0";



  src = fetchFromGitLab {

    owner = "entangle";

    repo = "entangle";

    rev = "v${version}";

    rev = "refs/tags/v${finalAttrs.version}";

    sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0=";

  };
@@ -71,17 +73,20 @@ stdenv.mkDerivation rec { 
    pkgconf

    wrapGAppsHook3

    gobject-introspection

    cmake

  ];



  buildInputs = [

  buildInputs =

    [

      at-spi2-core

      dbus

      libepoxy

      elfutils

      gexiv2

      glib

    gst-plugins-base

    gstreamer

      lerc

      gst_all_1.gst-plugins-base

      gst_all_1.gstreamer

      gtk3

      lcms2

      libdatrie
@@ -100,7 +105,8 @@ stdenv.mkDerivation rec { 
      udev

      util-linux

      zstd

  ] ++ (with xorg; [

    ]

    ++ (with xorg; [

      libXdmcp

      libXtst

    ]);
@@ -120,7 +126,7 @@ stdenv.mkDerivation rec { 
      --replace "Exec=entangle" "Exec=$out/bin/entangle"

  '';



  meta = with lib; {

  meta = {

    description = "Tethered camera control and capture";

    longDescription = ''

      Entangle uses GTK and libgphoto2 to provide a graphical interface
@@ -130,9 +136,9 @@ stdenv.mkDerivation rec { 
      This app can also serve as a camera app for mobile devices.

    '';

    homepage = "https://gitlab.com/entangle/entangle";

    license = licenses.gpl3Plus;

    platforms = platforms.all;

    maintainers = with maintainers; [ ShamrockLee ];

    license = lib.licenses.gpl3Plus;

    platforms = lib.platforms.all;

    maintainers = with lib.maintainers; [ ShamrockLee ];

    mainProgram = "entangle";

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -29066,10 +29066,6 @@ with pkgs; 














  enhanced-ctorrent = callPackage ../applications/networking/p2p/enhanced-ctorrent { };



























  entangle = callPackage ../applications/video/entangle {













    inherit (gst_all_1) gstreamer gst-plugins-base;













  };



























  eolie = callPackage ../applications/networking/browsers/eolie { };





























  eos-installer = callPackage ../applications/misc/eos-installer { };