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

haskellPackages.{cairo,pango,glib,gtk}: Depend on the stdenv libc instead of glibc

Browse Source 
svn path=/nixpkgs/trunk/; revision=29190
This commit is contained in:
Shea Levy 2011-09-11 18:48:46 +00:00
parent 2155a9b00f
commit d1808a89d3
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/haskell/cairo/default.nix
View File

@ -1,4 +1,4 @@
{ cabal, cairo, glibc, gtk2hsBuildtools, mtl, pkgconfig, zlib }: { cabal, cairo, gtk2hsBuildtools, mtl, pkgconfig, zlib }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "cairo"; pname = "cairo";
@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9"; sha256 = "0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9";
buildDepends = [ mtl ]; buildDepends = [ mtl ];
buildTools = [ gtk2hsBuildtools ]; buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ cairo glibc pkgconfig zlib ]; extraLibraries = [ cairo self.stdenv.gcc.libc pkgconfig zlib ];
pkgconfigDepends = [ cairo ]; pkgconfigDepends = [ cairo ];
meta = { meta = {
homepage = "http://www.haskell.org/gtk2hs/"; homepage = "http://www.haskell.org/gtk2hs/";

4
pkgs/development/libraries/haskell/glib/default.nix
View File

@ -1,11 +1,11 @@
{ cabal, glib, glibc, gtk2hsBuildtools, pkgconfig }: { cabal, glib, gtk2hsBuildtools, pkgconfig }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "glib"; pname = "glib";
version = "0.12.0"; version = "0.12.0";
sha256 = "1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19"; sha256 = "1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19";
buildTools = [ gtk2hsBuildtools ]; buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ glibc pkgconfig ]; extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
pkgconfigDepends = [ glib ]; pkgconfigDepends = [ glib ];
meta = { meta = {
homepage = "http://www.haskell.org/gtk2hs/"; homepage = "http://www.haskell.org/gtk2hs/";

4
pkgs/development/libraries/haskell/gtk/default.nix
View File

@ -1,4 +1,4 @@
{ cabal, cairo, glib, glibc, gtk, gtk2hsBuildtools, mtl, pango { cabal, cairo, glib, gtk, gtk2hsBuildtools, mtl, pango
, pkgconfig , pkgconfig
}: }:
@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
sha256 = "1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2"; sha256 = "1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2";
buildDepends = [ cairo glib mtl pango ]; buildDepends = [ cairo glib mtl pango ];
buildTools = [ gtk2hsBuildtools ]; buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ glibc pkgconfig ]; extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
pkgconfigDepends = [ glib gtk ]; pkgconfigDepends = [ glib gtk ];
meta = { meta = {
homepage = "http://www.haskell.org/gtk2hs/"; homepage = "http://www.haskell.org/gtk2hs/";

4
pkgs/development/libraries/haskell/pango/default.nix
View File

@ -1,4 +1,4 @@
{ cabal, cairo, glib, glibc, gtk2hsBuildtools, mtl, pango { cabal, cairo, glib, gtk2hsBuildtools, mtl, pango
, pkgconfig , pkgconfig
}: }:
@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
sha256 = "1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb"; sha256 = "1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb";
buildDepends = [ cairo glib mtl ]; buildDepends = [ cairo glib mtl ];
buildTools = [ gtk2hsBuildtools ]; buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ glibc pkgconfig ]; extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
pkgconfigDepends = [ cairo pango ]; pkgconfigDepends = [ cairo pango ];
meta = { meta = {
homepage = "http://www.haskell.org/gtk2hs/"; homepage = "http://www.haskell.org/gtk2hs/";

4
pkgs/top-level/haskell-packages.nix
View File

@ -434,7 +434,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
cairo = callPackage ../development/libraries/haskell/cairo { cairo = callPackage ../development/libraries/haskell/cairo {
inherit (pkgs) cairo zlib; 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 {}; caseInsensitive_0_3 = callPackage ../development/libraries/haskell/case-insensitive/0.3.nix {};
@ -602,7 +601,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
glib = callPackage ../development/libraries/haskell/glib { glib = callPackage ../development/libraries/haskell/glib {
glib = pkgs.glib; glib = pkgs.glib;
glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
}; };
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
@ -618,7 +616,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
gtk = callPackage ../development/libraries/haskell/gtk { gtk = callPackage ../development/libraries/haskell/gtk {
inherit (pkgs.gtkLibs) gtk; inherit (pkgs.gtkLibs) gtk;
glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
}; };
gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {};
@ -894,7 +891,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
pango = callPackage ../development/libraries/haskell/pango { pango = callPackage ../development/libraries/haskell/pango {
inherit (pkgs.gtkLibs) 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 {}; parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {};