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

* Fix the ratpoison build (http://hydra.nixos.org/build/915825).

Browse Source 
svn path=/nixpkgs/branches/x-updates/; revision=26296
This commit is contained in:
Eelco Dolstra 2011-03-14 10:25:26 +00:00
parent aaecb6430b
commit 440c82b96f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/window-managers/ratpoison/default.nix
View File

@ -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
];

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

@ -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;