forked from mirrors/nixpkgs
Merge pull request #12805 from erikryb/master
Add miniball package and fix haskell-miniball by adding the miniball package as dependency
This commit is contained in:
commit
ee63b37553
pkgs
development
top-level
|
@ -840,6 +840,9 @@ self: super: {
|
||||||
configurator = dontCheck super.configurator;
|
configurator = dontCheck super.configurator;
|
||||||
|
|
||||||
# The cabal files for these libraries do not list the required system dependencies.
|
# The cabal files for these libraries do not list the required system dependencies.
|
||||||
|
miniball = overrideCabal super.miniball (drv: {
|
||||||
|
librarySystemDepends = [ pkgs.miniball ];
|
||||||
|
});
|
||||||
SDL-image = overrideCabal super.SDL-image (drv: {
|
SDL-image = overrideCabal super.SDL-image (drv: {
|
||||||
librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
|
librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
|
||||||
});
|
});
|
||||||
|
|
25
pkgs/development/libraries/miniball/default.nix
Normal file
25
pkgs/development/libraries/miniball/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
{ stdenv, fetchurl }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "miniball-${version}";
|
||||||
|
version = "3.0";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://www.inf.ethz.ch/personal/gaertner/miniball/Miniball.hpp";
|
||||||
|
sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2";
|
||||||
|
};
|
||||||
|
|
||||||
|
phases = [ "installPhase" ];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/include
|
||||||
|
cp $src $out/include/miniball.hpp
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Smallest Enclosing Balls of Points";
|
||||||
|
homepage = https://www.inf.ethz.ch/personal/gaertner/miniball.html;
|
||||||
|
license = stdenv.lib.licenses.gpl3;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.erikryb ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2327,6 +2327,8 @@ let
|
||||||
|
|
||||||
miniupnpd = callPackage ../tools/networking/miniupnpd { };
|
miniupnpd = callPackage ../tools/networking/miniupnpd { };
|
||||||
|
|
||||||
|
miniball = callPackage ../development/libraries/miniball { };
|
||||||
|
|
||||||
minixml = callPackage ../development/libraries/minixml { };
|
minixml = callPackage ../development/libraries/minixml { };
|
||||||
|
|
||||||
mjpegtools = callPackage ../tools/video/mjpegtools { };
|
mjpegtools = callPackage ../tools/video/mjpegtools { };
|
||||||
|
|
Loading…
Reference in a new issue