Unverified Commit ba18cdfd authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

bino3d: 2.5 -> 2.6, fix build, move to by-name (#476484)

parents b3ac5a8a d38c9968

pkgs/applications/video/bino3d/default.nix→pkgs/by-name/bi/bino3d/package.nix

+13 −15
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchgit,

  fetchFromGitHub,

  cmake,

  ninja,

  pkg-config,

  pandoc,

  wrapQtAppsHook,

  qtbase,

  qtmultimedia,

  qttools,

  qt6,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "bino";

  version = "2.5";

  pname = "bino3d";

  version = "2.6";



  src = fetchgit {

    url = "https://git.marlam.de/git/bino.git";

    rev = "bino-${finalAttrs.version}";

    hash = "sha256-vGPbSYTfRy414xVcLIvOnN4Te36HWVz7DQegNhYb3u4=";

  src = fetchFromGitHub {

    owner = "marlam";

    repo = "bino";

    tag = "bino-${finalAttrs.version}";

    hash = "sha256-izgiAmMou/EW5KOzC8HuPaH4uVFLajoDhVwkJkzXdP0=";

  };



  nativeBuildInputs = [
@@ -27,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { 
    ninja

    pkg-config

    pandoc

    wrapQtAppsHook

    qt6.wrapQtAppsHook

  ];



  buildInputs = [

    qtbase

    qtmultimedia

    qttools

    qt6.qtbase

    qt6.qtmultimedia

    qt6.qttools

    # The optional QVR dependency is not currently packaged.

  ];

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -9983,8 +9983,6 @@ with pkgs; 


  bfcal = libsForQt5.callPackage ../applications/misc/bfcal { };



  bino3d = qt6Packages.callPackage ../applications/video/bino3d { };



  bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };

  bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };