diff options
| author | Peter Simons <simons@cryp.to> | 2009-10-02 13:57:21 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2009-10-02 13:57:21 +0000 |
| commit | 1570ccf3cf975cf3f005bbe20d82814e5fc1e7fa (patch) | |
| tree | 91b212cd725aba9ed71bc49bae7637c5726372d0 /pkgs/servers/x11 | |
| parent | 317fd0edd583876e5fc0b86952de6454f2837628 (diff) | |
| download | nixlib-1570ccf3cf975cf3f005bbe20d82814e5fc1e7fa.tar nixlib-1570ccf3cf975cf3f005bbe20d82814e5fc1e7fa.tar.gz nixlib-1570ccf3cf975cf3f005bbe20d82814e5fc1e7fa.tar.bz2 nixlib-1570ccf3cf975cf3f005bbe20d82814e5fc1e7fa.tar.lz nixlib-1570ccf3cf975cf3f005bbe20d82814e5fc1e7fa.tar.xz nixlib-1570ccf3cf975cf3f005bbe20d82814e5fc1e7fa.tar.zst nixlib-1570ccf3cf975cf3f005bbe20d82814e5fc1e7fa.zip | |
libXaw: fixed broken installation in MacOS X
See comments in file for further details. svn path=/nixpkgs/trunk/; revision=17609
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 74bfc27aae6c..efe5d06a08b5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -665,6 +665,19 @@ let sha256 = "1yaslcpj6sd6s8gx2hv60gfjf515gggd8f2jv4zqbp5q9wcapx0i"; }; 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 ;}; libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) { |