diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-14 14:28:23 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-14 14:28:23 +0100 |
commit | b4af993c3f2a2e9808b582eb6dd4500a2847fb2b (patch) | |
tree | 6a4d51255f30e0da26fb94d4725b6c19145bb89d /pkgs/development/libraries/haskell/pango | |
parent | 5ad9db047327b74a4002341f074369ee736e4f9e (diff) | |
parent | 961ed7c8b41bb80cdf5f4f0f5e49093ad171393b (diff) | |
download | nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.gz nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.bz2 nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.lz nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.xz nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.zst nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.zip |
Merge branch 'master' into staging
Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh
Diffstat (limited to 'pkgs/development/libraries/haskell/pango')
-rw-r--r-- | pkgs/development/libraries/haskell/pango/0.12.5.3.nix | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/pango/default.nix (renamed from pkgs/development/libraries/haskell/pango/0.13.0.3.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/pango/pango.patch | 10 |
3 files changed, 0 insertions, 32 deletions
diff --git a/pkgs/development/libraries/haskell/pango/0.12.5.3.nix b/pkgs/development/libraries/haskell/pango/0.12.5.3.nix deleted file mode 100644 index e95c590e3545..000000000000 --- a/pkgs/development/libraries/haskell/pango/0.12.5.3.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig -, text -}: - -cabal.mkDerivation (self: { - pname = "pango"; - version = "0.12.5.3"; - sha256 = "1n64ppz0jqrbzvimbz4avwnx3z0n5z2gbmbmca0hw9wqf9j6y79a"; - buildDepends = [ cairo glib mtl text ]; - buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ libc pkgconfig ]; - pkgconfigDepends = [ cairo pango ]; - patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./pango.patch ]; - meta = { - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Pango text rendering engine"; - license = self.stdenv.lib.licenses.lgpl21; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/pango/0.13.0.3.nix b/pkgs/development/libraries/haskell/pango/default.nix index c3ce339f7d55..c3ce339f7d55 100644 --- a/pkgs/development/libraries/haskell/pango/0.13.0.3.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix diff --git a/pkgs/development/libraries/haskell/pango/pango.patch b/pkgs/development/libraries/haskell/pango/pango.patch deleted file mode 100644 index af338cbe32ce..000000000000 --- a/pkgs/development/libraries/haskell/pango/pango.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/pango.cabal.orig 2014-11-03 15:11:35.000000000 -0600 -+++ b/pango.cabal 2014-11-03 15:11:57.000000000 -0600 -@@ -52,6 +52,7 @@ - build-depends: base < 4 - - build-tools: gtk2hsC2hs >= 0.13.8, gtk2hsTypeGen -+ cpp-options: -U__BLOCKS__ -D__attribute__(A)= - - exposed-modules: Graphics.Rendering.Pango - Graphics.Rendering.Pango.Font |