nek0/affection
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update nanovg dependency

Browse source
This commit is contained in:
nek0 2018-06-18 20:10:13 +02:00
parent 37bec202fe
commit 34bcb88e2e
2 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
affection.cabal
View file

@ -150,7 +150,7 @@ executable example01
, containers , containers
, linear , linear
, matrix , matrix
, nanovg , nanovg >= 0.6.0.0
, deepseq , deepseq
else else
buildable: False buildable: False

27
shell.nix
View file

@ -4,33 +4,26 @@ let
inherit (nixpkgs) pkgs; inherit (nixpkgs) pkgs;
nanovgNeko = with haskellPackages; callPackage ({ nanovgNeko = with haskellPackages; callPackage (
mkDerivation, base, bytestring, c2hs, containers, glew, hspec, { mkDerivation, base, bytestring, c2hs, containers, GLEW, glew
inline-c, libGL, libGLU, QuickCheck, text, vector, pkgconfig }: , hspec, inline-c, libGL, libGLU, QuickCheck, stdenv, text, vector
}:
mkDerivation { mkDerivation {
pname = "nanovg"; pname = "nanovg";
version = "0.5.2.0"; version = "0.6.0.0";
#src = pkgs.fetchFromGitHub { sha256 = "e35a2772f2a2e71916013cab70eeb8eedd6f66b5490ddf7ce237c8c76895d496";
# owner = "nek0";
# repo = "nanovg-hs";
# rev = "21868dc2c8e6eae8e7c0962d22890a8f2522cab0";
# sha256 = "0diyyajniyxzmg5za34crwwlajf40x8bplja6mbgv2syax5d446d";
# fetchSubmodules = true;
#};
src = ../nanovg-hs;
revision = "1";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
doCheck = false; doCheck = false;
libraryHaskellDepends = [ base bytestring containers text vector ]; libraryHaskellDepends = [ base bytestring containers text vector ];
librarySystemDepends = [ glew libGL libGLU pkgconfig ]; librarySystemDepends = [ GLEW libGL libGLU ];
libraryPkgconfigDepends = [ glew ];
libraryToolDepends = [ c2hs ]; libraryToolDepends = [ c2hs ];
testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
homepage = "https://github.com/cocreature/nanovg-hs"; homepage = "https://github.com/cocreature/nanovg-hs";
description = "Haskell bindings for nanovg"; description = "Haskell bindings for nanovg";
license = pkgs.stdenv.lib.licenses.isc; license = stdenv.lib.licenses.isc;
hydraPlatforms = pkgs.stdenv.lib.platforms.none; }) {};
}) { inherit (pkgs) glew; inherit (pkgs) libGL; inherit (pkgs) libGLU; inherit (pkgs) pkgconfig; };
f = { mkDerivation, base, bytestring, clock, containers, deepseq f = { mkDerivation, base, bytestring, clock, containers, deepseq
, glib, linear, matrix, monad-loops, monad-parallel, mtl , glib, linear, matrix, monad-loops, monad-parallel, mtl