diff options
author | Peter Simons <simons@cryp.to> | 2009-12-09 15:56:20 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2009-12-09 15:56:20 +0000 |
commit | d21a4d14fc4ee47876e6f83e8275075459c0410a (patch) | |
tree | 8eed836aae0c31306ae653c4360f205ba84677b0 /pkgs/servers | |
parent | abebc10cf1d3d0101ed678b0c96420f0770b686a (diff) | |
download | nixlib-d21a4d14fc4ee47876e6f83e8275075459c0410a.tar nixlib-d21a4d14fc4ee47876e6f83e8275075459c0410a.tar.gz nixlib-d21a4d14fc4ee47876e6f83e8275075459c0410a.tar.bz2 nixlib-d21a4d14fc4ee47876e6f83e8275075459c0410a.tar.lz nixlib-d21a4d14fc4ee47876e6f83e8275075459c0410a.tar.xz nixlib-d21a4d14fc4ee47876e6f83e8275075459c0410a.tar.zst nixlib-d21a4d14fc4ee47876e6f83e8275075459c0410a.zip |
pkgs/servers/x11/xorg/overrides.nix: dropped override for libXaw on Darwin
With the latest version of libXaw, those patches aren't necessary anymore; the build has been fixed upstream. svn path=/nixpkgs/trunk/; revision=18856
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 88acfe67a6d0..372ab0961839 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -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 ]; |