diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 14:50:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:19:01 +0200 |
| commit | fa6ddd7fa6cda8c2f7e5b4d260895ff3e462a248 (patch) | |
| tree | 417e3d46c166346186003160ea4e10b738266d7b /pkgs/top-level | |
| parent | 783c40eb68bbbcb9cf6918255157ecab55eedb6e (diff) | |
| download | nixlib-fa6ddd7fa6cda8c2f7e5b4d260895ff3e462a248.tar nixlib-fa6ddd7fa6cda8c2f7e5b4d260895ff3e462a248.tar.gz nixlib-fa6ddd7fa6cda8c2f7e5b4d260895ff3e462a248.tar.bz2 nixlib-fa6ddd7fa6cda8c2f7e5b4d260895ff3e462a248.tar.lz nixlib-fa6ddd7fa6cda8c2f7e5b4d260895ff3e462a248.tar.xz nixlib-fa6ddd7fa6cda8c2f7e5b4d260895ff3e462a248.tar.zst nixlib-fa6ddd7fa6cda8c2f7e5b4d260895ff3e462a248.zip | |
xorg.{libICE,libSM}: split dev and doc outputs
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1d5acb22224..1b1143e267c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13478,7 +13478,7 @@ let patchPhase = '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . - substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11}/lib/libX11.so.6" + substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11.out}/lib/libX11.so.6" gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -shared \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ @@ -14692,7 +14692,7 @@ let # I don't know why I need to add these libraries. Shouldn't they # be part of wxPython? postInstall = '' - libspaths=${pkgs.xorg.libSM}/lib:${pkgs.xorg.libXScrnSaver}/lib + libspaths=${with pkgs.xorg; lib.makeLibraryPath [ libSM libXScrnSaver ]} wrapProgram $out/bin/taskcoach.py \ --prefix LD_LIBRARY_PATH : $libspaths ''; |