alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Move libXaw fix from default.nix to overrides.nix.

Browse source 
svn path=/nixpkgs/trunk/; revision=17620
This commit is contained in:
Peter Simons 2009-10-02 18:03:23 +00:00
parent 67cea803fa
commit b9b57c6149
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/servers/x11/xorg/default.nix
View file

@ -665,19 +665,6 @@ let
sha256 = "1yaslcpj6sd6s8gx2hv60gfjf515gggd8f2jv4zqbp5q9wcapx0i"; sha256 = "1yaslcpj6sd6s8gx2hv60gfjf515gggd8f2jv4zqbp5q9wcapx0i";
}; };
buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ]; buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ];
# The libXaw installation is broken on MacOS X. The package has hard-coded
# know-how that assumes shared libraries use an .so suffix. MacOS, however,
# uses .dylib. Furthermore, the package fails to install an unversioned
# libtool .la file for the library.
postInstall = ''
cd $out/lib
ln -s libXaw8.la libXaw.la
if [ ${stdenv.system} = "i686-darwin" ]; then
rm *.so*
ln -s libXaw8.dylib libXaw.dylib
fi
'';
})) // {inherit printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ;}; })) // {inherit printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ;};
libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) { libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {

15
pkgs/servers/x11/xorg/overrides.nix
View file

@ -23,6 +23,21 @@
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
}; };
libXaw = attrs: attrs // {
# The libXaw installation is broken on MacOS X. The package has hard-coded
# know-how that assumes shared libraries use an .so suffix. MacOS, however,
# uses .dylib. Furthermore, the package fails to install an unversioned
# libtool .la file for the library.
postInstall = ''
cd $out/lib
ln -s libXaw8.la libXaw.la
if [ ${args.stdenv.system} = "i686-darwin" ]; then
rm *.so*
ln -s libXaw8.dylib libXaw.dylib
fi
'';
};
setxkbmap = attrs: attrs // { setxkbmap = attrs: attrs // {
postInstall = postInstall =
'' ''