Author: shlevy
Date: Sun Sep 11 18:48:46 2011
New Revision: 29190
URL: https://ssl.nixos.org/websvn/nix/?rev=29190&sc=1
Log:
haskellPackages.{cairo,pango,glib,gtk}: Depend on the stdenv libc instead of
glibc
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix Sun Sep
11 18:28:14 2011 (r29189)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix Sun Sep
11 18:48:46 2011 (r29190)
@@ -1,4 +1,4 @@
-{ cabal, cairo, glibc, gtk2hsBuildtools, mtl, pkgconfig, zlib }:
+{ cabal, cairo, gtk2hsBuildtools, mtl, pkgconfig, zlib }:
cabal.mkDerivation (self: {
pname = "cairo";
@@ -6,7 +6,7 @@
sha256 = "0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9";
buildDepends = [ mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ cairo glibc pkgconfig zlib ];
+ extraLibraries = [ cairo self.stdenv.gcc.libc pkgconfig zlib ];
pkgconfigDepends = [ cairo ];
meta = {
homepage = "http://www.haskell.org/gtk2hs/";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix Sun Sep
11 18:28:14 2011 (r29189)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix Sun Sep
11 18:48:46 2011 (r29190)
@@ -1,11 +1,11 @@
-{ cabal, glib, glibc, gtk2hsBuildtools, pkgconfig }:
+{ cabal, glib, gtk2hsBuildtools, pkgconfig }:
cabal.mkDerivation (self: {
pname = "glib";
version = "0.12.0";
sha256 = "1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19";
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
pkgconfigDepends = [ glib ];
meta = {
homepage = "http://www.haskell.org/gtk2hs/";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix Sun Sep
11 18:28:14 2011 (r29189)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix Sun Sep
11 18:48:46 2011 (r29190)
@@ -1,4 +1,4 @@
-{ cabal, cairo, glib, glibc, gtk, gtk2hsBuildtools, mtl, pango
+{ cabal, cairo, glib, gtk, gtk2hsBuildtools, mtl, pango
, pkgconfig
}:
@@ -8,7 +8,7 @@
sha256 = "1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2";
buildDepends = [ cairo glib mtl pango ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
pkgconfigDepends = [ glib gtk ];
meta = {
homepage = "http://www.haskell.org/gtk2hs/";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix Sun Sep
11 18:28:14 2011 (r29189)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix Sun Sep
11 18:48:46 2011 (r29190)
@@ -1,4 +1,4 @@
-{ cabal, cairo, glib, glibc, gtk2hsBuildtools, mtl, pango
+{ cabal, cairo, glib, gtk2hsBuildtools, mtl, pango
, pkgconfig
}:
@@ -8,7 +8,7 @@
sha256 = "1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb";
buildDepends = [ cairo glib mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ glibc pkgconfig ];
+ extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
pkgconfigDepends = [ cairo pango ];
meta = {
homepage = "http://www.haskell.org/gtk2hs/";;
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 18:28:14
2011 (r29189)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 18:48:46
2011 (r29190)
@@ -434,7 +434,6 @@
cairo = callPackage ../development/libraries/haskell/cairo {
inherit (pkgs) cairo zlib;
- glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
};
caseInsensitive_0_3 = callPackage
../development/libraries/haskell/case-insensitive/0.3.nix {};
@@ -602,7 +601,6 @@
glib = callPackage ../development/libraries/haskell/glib {
glib = pkgs.glib;
- glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
};
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
@@ -618,7 +616,6 @@
gtk = callPackage ../development/libraries/haskell/gtk {
inherit (pkgs.gtkLibs) gtk;
- glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
};
gtk2hsBuildtools = callPackage
../development/libraries/haskell/gtk2hs-buildtools {};
@@ -894,7 +891,6 @@
pango = callPackage ../development/libraries/haskell/pango {
inherit (pkgs.gtkLibs) pango;
- glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
};
parallel_1_1_0_1 = callPackage
../development/libraries/haskell/parallel/1.1.0.1.nix {};
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
