movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-07-14 14:10:37 +03:00
Code Activity

ignition.common1: remove

Browse source
This commit is contained in:
Ben Wolsieffer 2023-10-03 20:49:52 -04:00
parent 50ed7caf7d
commit ae86ca9a37
3 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pkgs/default.nix
View file

@ -101,7 +101,6 @@ in {
cmake2 = self.callPackage ./ignition/cmake { };
cmake = self.ignition.cmake2;
common1 = self.callPackage ./ignition/common/1.nix { };
common3 = self.callPackage ./ignition/common/3.nix { };
common4 = self.callPackage ./ignition/common { };
common = self.ignition.common4;

10
pkgs/ignition/common/1.nix
View file

@ -1,10 +0,0 @@
{ callPackage, ignition, ffmpeg_4, ... } @ args :
callPackage ./. ({
majorVersion = "";
version = "1.1.1";
srcHash = "sha256-n3/7mbI53c81PT5x9uzF5e3xNjxNYJvEo0pcVD3kaAw=";
ignition-cmake = ignition.cmake0;
ignition-math = ignition.math4;
ffmpeg = ffmpeg_4;
} // args)

8
pkgs/ignition/common/default.nix
View file

@ -26,13 +26,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
propagatedNativeBuildInputs = [ ignition-cmake ];
buildInputs = [ ignition-math tinyxml-2 ]
++ lib.optionals (lib.versionAtLeast version "3")
[ ignition-math gts freeimage ffmpeg ]
buildInputs = [ ignition-math tinyxml-2 ignition-math gts freeimage ffmpeg ]
++ lib.optional (lib.versionAtLeast version "4") ignition-utils;
propagatedBuildInputs = [ libuuid ]
++ lib.optionals (lib.versionOlder version "3")
[ ignition-math gts freeimage ffmpeg ];
propagatedBuildInputs = [ libuuid ];
meta = with lib; {
homepage = "https://ignitionrobotics.org/libs/common";