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

Undo some changes only appropriate for the clang fork

Browse Source
This commit is contained in:
John Wiegley 2014-11-03 15:30:53 -06:00
parent b61d8d620f
commit 311c6c66bf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,7 +367,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
}; };
cairo_0_13_0_4 = callPackage ../development/libraries/haskell/cairo/0.13.0.4.nix { cairo_0_13_0_4 = callPackage ../development/libraries/haskell/cairo/0.13.0.4.nix {
inherit (pkgs) cairo zlib; inherit (pkgs) cairo zlib;
libc = pkgs.stdenv.cc.libc; libc = pkgs.stdenv.gcc.libc;
}; };
cairo = self.cairo_0_13_0_4; cairo = self.cairo_0_13_0_4;
@ -977,7 +977,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
}; };
glib_0_13_0_5 = callPackage ../development/libraries/haskell/glib/0.13.0.5.nix { glib_0_13_0_5 = callPackage ../development/libraries/haskell/glib/0.13.0.5.nix {
glib = pkgs.glib; glib = pkgs.glib;
libc = pkgs.stdenv.cc.libc; libc = pkgs.stdenv.gcc.libc;
}; };
glib = self.glib_0_13_0_5; glib = self.glib_0_13_0_5;
@ -1039,7 +1039,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
}; };
gtk_0_13_0_3 = callPackage ../development/libraries/haskell/gtk/0.13.0.3.nix { gtk_0_13_0_3 = callPackage ../development/libraries/haskell/gtk/0.13.0.3.nix {
inherit (pkgs) gtk; inherit (pkgs) gtk;
libc = pkgs.stdenv.cc.libc; libc = pkgs.stdenv.gcc.libc;
}; };
gtk = self.gtk_0_13_0_3; gtk = self.gtk_0_13_0_3;
@ -1916,7 +1916,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
pango_0_12_5_3 = callPackage ../development/libraries/haskell/pango/0.12.5.3.nix { pango_0_12_5_3 = callPackage ../development/libraries/haskell/pango/0.12.5.3.nix {
inherit (pkgs) pango; inherit (pkgs) pango;
libc = pkgs.stdenv.cc.libc; libc = pkgs.stdenv.gcc.libc;
glib = self.glib_0_12_5_4; glib = self.glib_0_12_5_4;
cairo = self.cairo_0_12_5_3; cairo = self.cairo_0_12_5_3;
}; };