Author: simons
Date: Fri Aug 26 10:29:06 2011
New Revision: 28826
URL: https://svn.nixos.org/websvn/nix/?rev=28826&sc=1
Log:
haskell-X11-xft: cabal2nix can re-generate this expression now
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/X11-xft/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/X11-xft/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/X11-xft/default.nix
Fri Aug 26 10:28:59 2011 (r28825)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/X11-xft/default.nix
Fri Aug 26 10:29:06 2011 (r28826)
@@ -1,11 +1,14 @@
-{ ghc, cabal, X11, utf8String, pkgconfig, libXft, freetype, fontconfig }:
-cabal.mkDerivation (self : {
+{ cabal, fontconfig, freetype, libXft, pkgconfig, utf8String, X11
+}:
+
+cabal.mkDerivation (self: {
pname = "X11-xft";
version = "0.3";
sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d";
- buildInputs = [ ghc pkgconfig libXft freetype fontconfig ];
- propagatedBuildInputs = [ X11 utf8String ];
- configureFlags=["--extra-include-dirs=${freetype}/include/freetype2"];
+ buildDepends = [ utf8String X11 ];
+ extraLibraries = [ fontconfig freetype pkgconfig ];
+ pkgconfigDepends = [ libXft ];
+ configureFlags = "--extra-include-dirs=${freetype}/include/freetype2";
meta = {
description = "Bindings to the Xft, X Free Type interface library, and
some Xrender parts";
license = "LGPL";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
