diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 11:22:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 11:23:34 +0200 |
| commit | 32b31398eb562152a11d1be992c5ea6e110013f5 (patch) | |
| tree | f6e77a79ceb20eb3e05d1c372b9671fdfa1cc193 | |
| parent | 328eafa8857c0b4de84581935cdcb323259f2e0f (diff) | |
| download | nixlib-32b31398eb562152a11d1be992c5ea6e110013f5.tar nixlib-32b31398eb562152a11d1be992c5ea6e110013f5.tar.gz nixlib-32b31398eb562152a11d1be992c5ea6e110013f5.tar.bz2 nixlib-32b31398eb562152a11d1be992c5ea6e110013f5.tar.lz nixlib-32b31398eb562152a11d1be992c5ea6e110013f5.tar.xz nixlib-32b31398eb562152a11d1be992c5ea6e110013f5.tar.zst nixlib-32b31398eb562152a11d1be992c5ea6e110013f5.zip | |
xorg.libXt: re-split into multiple outputs
Fixed all 'libXt}' references, too.
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/system/plan9port/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/plan9port/default.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 5ca5cc1cb582..15b675c9a5d5 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { '' else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") } - patchelf --set-rpath ${stdenv.cc.cc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i + patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc dbus libX11 libXt libXext libXmu libXfixes libXrandr libXcursor ]} $i done for i in lib/VBoxOGL*.so diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a7464a12485e..b590b97c5713 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -127,7 +127,7 @@ in ''; propagatedBuildInputs = [ xorg.libSM ]; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; - outputs = [ "out" "doc" "man" ]; + outputs = [ "dev" "out" "doc" ]; # "dev-doc" only (incl. man pages) }; # See https://bugs.freedesktop.org/show_bug.cgi?id=47792 diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 2434889581ed..98b8ac7418b5 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -5,8 +5,8 @@ export PLAN9_TARGET=$PLAN9 configurePhase() { - echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config - echo X11=\"${libXt}/include\" >> LOCAL.config + echo CFLAGS=\"-I${fontconfig}/include -I${libXt_dev}/include\" > LOCAL.config + echo X11=\"${libXt_dev}/include\" >> LOCAL.config for f in `grep -l -r /usr/local/plan9`; do sed "s,/usr/local/plan9,${PLAN9},g" -i $f diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 3a78cb2baf63..9833d81be1a2 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; - inherit libXt; + libXt_dev = libXt.dev; inherit fontconfig; } |