diff options
author | Eric Kow <eric.kow@gmail.com> | 2013-11-03 16:35:56 +0000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-11-07 10:39:28 +0100 |
commit | 1be6aae4b4a26ac6f06c764f076bd57206e6fded (patch) | |
tree | 3456a255c14a69cd656672a1a4cbbdba1097b001 /pkgs/os-specific/darwin/native-x11-and-opengl | |
parent | 0eeee298ef06d28ab428aaa0b7c12d0188f1d421 (diff) | |
download | nixpkgs-1be6aae4b4a26ac6f06c764f076bd57206e6fded.tar nixpkgs-1be6aae4b4a26ac6f06c764f076bd57206e6fded.tar.gz nixpkgs-1be6aae4b4a26ac6f06c764f076bd57206e6fded.tar.bz2 nixpkgs-1be6aae4b4a26ac6f06c764f076bd57206e6fded.tar.lz nixpkgs-1be6aae4b4a26ac6f06c764f076bd57206e6fded.tar.xz nixpkgs-1be6aae4b4a26ac6f06c764f076bd57206e6fded.tar.zst nixpkgs-1be6aae4b4a26ac6f06c764f076bd57206e6fded.zip |
darwin x11/opengl: only copy subset of files (close #1165)
Copy only the pc files related to X11 and OpenGL. This should allow us to build our own version of libraries like cairo without having the native ones be accidentally dynamically linked in to things that depend on them. Before this patch if we `dyldinfo -dylibs libpangocairo` we can see that it was dynamically linked against the OS X (but seemingly built against include files from the nix one, as we would get a runtime complaint about missing symbols)
Diffstat (limited to 'pkgs/os-specific/darwin/native-x11-and-opengl')
-rw-r--r-- | pkgs/os-specific/darwin/native-x11-and-opengl/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix index cee03741dce..3844912f6ba 100644 --- a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix +++ b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix @@ -7,6 +7,10 @@ stdenv.mkDerivation rec { builder = writeScript "${name}-builder.sh" '' /bin/mkdir -p $out - /bin/ln -sv /usr/X11/{bin,lib,include,share} $out/ + /bin/mkdir $out/lib + /bin/ln -sv /usr/X11/lib/{*.dylib,X11,xorg} $out/lib + /bin/mkdir $out/lib/pkgconfig + /bin/ln -sv /usr/X11/lib/pkgconfig/{x*.pc,gl*.pc} $out/lib/pkgconfig + /bin/ln -sv /usr/X11/{bin,include,share} $out/ ''; } |