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

Fix wxGTK reference for xchm

Browse Source 
svn path=/nixpkgs/trunk/; revision=18156
This commit is contained in:
Michael Raskin 2009-11-05 21:08:53 +00:00
parent 1e675384b0
commit e4a67dbe5b
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1938,6 +1938,10 @@ let
libXrandr xproto renderproto xextproto inputproto randrproto; libXrandr xproto renderproto xextproto inputproto randrproto;
}); });
gcl = builderDefsPackage ../development/compilers/gcl {
inherit gmp mpfr m4 binutils ;
};
# GHC # GHC
# GHC binaries are around for bootstrapping purposes # GHC binaries are around for bootstrapping purposes
@ -3253,8 +3257,9 @@ let
directfb = import ../development/libraries/directfb { directfb = import ../development/libraries/directfb {
inherit fetchurl stdenv perl zlib libjpeg freetype inherit fetchurl stdenv perl zlib libjpeg freetype
SDL libpng; SDL libpng giflib;
inherit (xlibs) libX11 libXext xproto xextproto; inherit (xlibs) libX11 libXext xproto xextproto renderproto
libXrender;
}; };
enchant = makeOverridable enchant = makeOverridable
@ -5264,6 +5269,11 @@ let
stdenv = if stdenv.system == "powerpc-linux" then overrideGCC stdenv gcc34 else stdenv; stdenv = if stdenv.system == "powerpc-linux" then overrideGCC stdenv gcc34 else stdenv;
}; };
directvnc = builderDefsPackage ../os-specific/linux/directvnc {
inherit libjpeg pkgconfig zlib directfb;
inherit (xlibs) xproto;
};
dmraid = builderDefsPackage ../os-specific/linux/dmraid { dmraid = builderDefsPackage ../os-specific/linux/dmraid {
inherit devicemapper; inherit devicemapper;
}; };
@ -7199,7 +7209,7 @@ let
}; };
links2 = (builderDefsPackage ../applications/networking/browsers/links2) { links2 = (builderDefsPackage ../applications/networking/browsers/links2) {
inherit fetchurl stdenv bzip2 zlib libjpeg libpng libtiff directfb inherit fetchurl stdenv bzip2 zlib libjpeg libpng libtiff
gpm openssl SDL SDL_image SDL_net pkgconfig; gpm openssl SDL SDL_image SDL_net pkgconfig;
inherit (xlibs) libX11 libXau xproto libXt; inherit (xlibs) libX11 libXau xproto libXt;
}; };
@ -7813,7 +7823,8 @@ let
}; };
xchm = import ../applications/misc/xchm { xchm = import ../applications/misc/xchm {
inherit fetchurl stdenv wxGTK26 chmlib; inherit fetchurl stdenv chmlib;
wxGTK = wxGTK26;
}; };
/* Doesn't work yet /* Doesn't work yet