swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 05:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12805 from erikryb/master

Browse source 
Add miniball package and fix haskell-miniball by adding the miniball package as dependency
This commit is contained in:
Peter Simons 2016-02-03 18:44:43 +01:00
parent 4c57b932ab 3333a9edab
commit ee63b37553
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -840,6 +840,9 @@ self: super: {
configurator = dontCheck super.configurator;
# 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: {
librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
});

25
pkgs/development/libraries/miniball/default.nix Normal file
View 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 ];
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -2327,6 +2327,8 @@ let
miniupnpd = callPackage ../tools/networking/miniupnpd { };
miniball = callPackage ../development/libraries/miniball { };
minixml = callPackage ../development/libraries/minixml { };
mjpegtools = callPackage ../tools/video/mjpegtools { };