Unverified Commit b50a77c0 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #290366 from K900/drop-collada-dom 

collada-dom: drop
parents 7f6d3a3a e69e9061

pkgs/development/libraries/collada-dom/default.nix

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, cmake, boost, libxml2, minizip, readline }:



stdenv.mkDerivation {

  pname = "collada-dom";

  version = "unstable-2020-01-03";



  src = fetchFromGitHub {

    owner = "rdiankov";

    repo = "collada-dom";

    rev = "c1e20b7d6ff806237030fe82f126cb86d661f063";

    sha256 = "sha256-A1ne/D6S0shwCzb9spd1MoSt/238HWA8dvgd+DC9cXc=";

  };



  postInstall = ''

    chmod +w -R $out

    ln -s $out/include/*/* $out/include

  '';



  nativeBuildInputs = [ cmake ];



  buildInputs = [

    boost

    libxml2

    minizip

    readline

  ];



  meta = with lib; {

    description = "Lightweight version of collada-dom, with only the parser.";

    homepage = "https://github.com/rdiankov/collada-dom";

    license = licenses.mit;

    maintainers = with maintainers; [ marius851000 ];

    platforms = platforms.all;

  };

}

pkgs/development/libraries/openscenegraph/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
  tiffSupport ? true, libtiff,

  gdalSupport ? false, gdal,

  curlSupport ? true, curl,

  colladaSupport ? false, collada-dom,

  colladaSupport ? false, opencollada,

  opencascadeSupport ? false, opencascade-occt,

  ffmpegSupport ? false, ffmpeg,

  nvttSupport ? false, nvidia-texture-tools,
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec { 
    ++ lib.optional tiffSupport libtiff

    ++ lib.optional gdalSupport gdal

    ++ lib.optional curlSupport curl

    ++ lib.optional colladaSupport collada-dom

    ++ lib.optional colladaSupport opencollada

    ++ lib.optional opencascadeSupport opencascade-occt

    ++ lib.optional ffmpegSupport ffmpeg

    ++ lib.optional nvttSupport nvidia-texture-tools

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ mapAliases ({ 
  citra = citra-nightly; # added 2022-05-17

  clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08

  inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17

  collada-dom = opencollada; # added 2024-02-21

  composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08

  cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15

  crispyDoom = crispy-doom; # Added 2023-05-01

pkgs/top-level/all-packages.nix

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














  cointop = callPackage ../applications/misc/cointop { };



























  collada-dom = callPackage ../development/libraries/collada-dom { };



























  coloquinte = callPackage ../development/libraries/science/electronics/coloquinte { };





























  cog = callPackage ../development/web/cog { };