diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-14 10:25:26 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-14 10:25:26 +0000 |
| commit | 440c82b96fe1debf702a188466555866b7365321 (patch) | |
| tree | c7db0b744b14bff96f9d823e234777f42213fdee /pkgs | |
| parent | aaecb6430b2b672dfa7e3dc98afbd794cd8826eb (diff) | |
| download | nixlib-440c82b96fe1debf702a188466555866b7365321.tar nixlib-440c82b96fe1debf702a188466555866b7365321.tar.gz nixlib-440c82b96fe1debf702a188466555866b7365321.tar.bz2 nixlib-440c82b96fe1debf702a188466555866b7365321.tar.lz nixlib-440c82b96fe1debf702a188466555866b7365321.tar.xz nixlib-440c82b96fe1debf702a188466555866b7365321.tar.zst nixlib-440c82b96fe1debf702a188466555866b7365321.zip | |
* Fix the ratpoison build (http://hydra.nixos.org/build/915825).
svn path=/nixpkgs/branches/x-updates/; revision=26296
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/window-managers/ratpoison/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index df8c97466ff2..77a998b9f74c 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig +{ stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig, freetype , libXtst, xextproto, readline, libXi, pkgconfig, perl, autoconf, automake }: stdenv.mkDerivation rec { @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -vf"; # needed because of the patch above + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; # urgh + buildInputs = - [ libX11 inputproto libXt libXpm libXft fontconfig libXtst + [ libX11 inputproto libXt libXpm libXft fontconfig freetype libXtst xextproto readline libXi pkgconfig perl autoconf automake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a4a895c80db..da69a881e529 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5940,9 +5940,7 @@ let libgnomeui libglade glib gtk scrollkeeper gnome_keyring; }); - evolution_data_server = (newScope (gnome // gtkLibs)) - ../servers/evolution-data-server { - }; + evolution_data_server = newScope (gnome // gtkLibs) ../servers/evolution-data-server { }; exrdisplay = callPackage ../applications/graphics/exrdisplay { fltk = fltk20; |