From 34bcb88e2e980a0ae6ac872ec6a87ee782f2d4de Mon Sep 17 00:00:00 2001 From: nek0 Date: Mon, 18 Jun 2018 20:10:13 +0200 Subject: [PATCH] update nanovg dependency --- affection.cabal | 2 +- shell.nix | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/affection.cabal b/affection.cabal index 99c68d3..dfeec64 100644 --- a/affection.cabal +++ b/affection.cabal @@ -150,7 +150,7 @@ executable example01 , containers , linear , matrix - , nanovg + , nanovg >= 0.6.0.0 , deepseq else buildable: False diff --git a/shell.nix b/shell.nix index 30c2334..eb3df2a 100644 --- a/shell.nix +++ b/shell.nix @@ -4,33 +4,26 @@ let inherit (nixpkgs) pkgs; - nanovgNeko = with haskellPackages; callPackage ({ - mkDerivation, base, bytestring, c2hs, containers, glew, hspec, - inline-c, libGL, libGLU, QuickCheck, text, vector, pkgconfig }: + nanovgNeko = with haskellPackages; callPackage ( + { mkDerivation, base, bytestring, c2hs, containers, GLEW, glew + , hspec, inline-c, libGL, libGLU, QuickCheck, stdenv, text, vector + }: mkDerivation { pname = "nanovg"; - version = "0.5.2.0"; - #src = pkgs.fetchFromGitHub { - # owner = "nek0"; - # repo = "nanovg-hs"; - # rev = "21868dc2c8e6eae8e7c0962d22890a8f2522cab0"; - # sha256 = "0diyyajniyxzmg5za34crwwlajf40x8bplja6mbgv2syax5d446d"; - # fetchSubmodules = true; - #}; - src = ../nanovg-hs; - revision = "1"; + version = "0.6.0.0"; + sha256 = "e35a2772f2a2e71916013cab70eeb8eedd6f66b5490ddf7ce237c8c76895d496"; isLibrary = true; isExecutable = true; doCheck = false; libraryHaskellDepends = [ base bytestring containers text vector ]; - librarySystemDepends = [ glew libGL libGLU pkgconfig ]; + librarySystemDepends = [ GLEW libGL libGLU ]; + libraryPkgconfigDepends = [ glew ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; homepage = "https://github.com/cocreature/nanovg-hs"; description = "Haskell bindings for nanovg"; - license = pkgs.stdenv.lib.licenses.isc; - hydraPlatforms = pkgs.stdenv.lib.platforms.none; - }) { inherit (pkgs) glew; inherit (pkgs) libGL; inherit (pkgs) libGLU; inherit (pkgs) pkgconfig; }; + license = stdenv.lib.licenses.isc; + }) {}; f = { mkDerivation, base, bytestring, clock, containers, deepseq , glib, linear, matrix, monad-loops, monad-parallel, mtl