public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
obadz
2016-08-23 18:50:06 +01:00
parent 13c04c837d 415e1983ca
commit 0e8d2725dc
244 changed files with 767 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/hackage-packages.nix
View File

@@ -67960,7 +67960,7 @@ self: {
doHaddock = false;
preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
preCompileBuildDriver = ''
PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
PKG_CONFIG_PATH+=":${cairo.dev}/lib/pkgconfig"
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
'';
homepage = "https://github.com/haskell-gi/haskell-gi";
@@ -67986,7 +67986,7 @@ self: {
doHaddock = false;
preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
preCompileBuildDriver = ''
PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
PKG_CONFIG_PATH+=":${cairo.dev}/lib/pkgconfig"
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
'';
homepage = "https://github.com/haskell-gi/haskell-gi";