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

pkgs/servers/x11/xorg/overrides.nix: dropped override for libXaw on Darwin

Browse source 
With the latest version of libXaw, those patches aren't necessary
anymore; the build has been fixed upstream.

svn path=/nixpkgs/trunk/; revision=18856
This commit is contained in:
Peter Simons 2009-12-09 15:56:20 +00:00
parent abebc10cf1
commit d21a4d14fc
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,21 +29,6 @@
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 // {
postInstall =
''
@ -100,7 +85,7 @@
[ args.zlib xorg.xf86bigfontproto xorg.glproto args.mesa xorg.xf86driproto
xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto xorg.dmxproto
xorg.libdmx xorg.xf86vidmodeproto xorg.libXext
xorg.libdmx xorg.xf86vidmodeproto xorg.libXext
];
propagatedBuildInputs =
[ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ];