Merge pull request #12805 from erikryb/master

Add miniball package and fix haskell-miniball by adding the miniball package as dependency

+30
+3
pkgs/development/haskell-modules/configuration-common.nix
··· 840 configurator = dontCheck super.configurator; 841 842 # The cabal files for these libraries do not list the required system dependencies. 843 SDL-image = overrideCabal super.SDL-image (drv: { 844 librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or []; 845 });
··· 840 configurator = dontCheck super.configurator; 841 842 # The cabal files for these libraries do not list the required system dependencies. 843 + miniball = overrideCabal super.miniball (drv: { 844 + librarySystemDepends = [ pkgs.miniball ]; 845 + }); 846 SDL-image = overrideCabal super.SDL-image (drv: { 847 librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or []; 848 });
+25
pkgs/development/libraries/miniball/default.nix
···
··· 1 + { stdenv, fetchurl }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "miniball-${version}"; 5 + version = "3.0"; 6 + 7 + src = fetchurl { 8 + url = "https://www.inf.ethz.ch/personal/gaertner/miniball/Miniball.hpp"; 9 + sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2"; 10 + }; 11 + 12 + phases = [ "installPhase" ]; 13 + 14 + installPhase = '' 15 + mkdir -p $out/include 16 + cp $src $out/include/miniball.hpp 17 + ''; 18 + 19 + meta = { 20 + description = "Smallest Enclosing Balls of Points"; 21 + homepage = https://www.inf.ethz.ch/personal/gaertner/miniball.html; 22 + license = stdenv.lib.licenses.gpl3; 23 + maintainers = [ stdenv.lib.maintainers.erikryb ]; 24 + }; 25 + }
+2
pkgs/top-level/all-packages.nix
··· 2327 2328 miniupnpd = callPackage ../tools/networking/miniupnpd { }; 2329 2330 minixml = callPackage ../development/libraries/minixml { }; 2331 2332 mjpegtools = callPackage ../tools/video/mjpegtools { };
··· 2327 2328 miniupnpd = callPackage ../tools/networking/miniupnpd { }; 2329 2330 + miniball = callPackage ../development/libraries/miniball { }; 2331 + 2332 minixml = callPackage ../development/libraries/minixml { }; 2333 2334 mjpegtools = callPackage ../tools/video/mjpegtools { };