diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 12:23:02 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 12:23:56 +0200 |
commit | f8c211fd2b53d970a439d643bea9d0928fb08666 (patch) | |
tree | 5084d953ed0e15e81e556c5db1399143c8069fc8 /pkgs/tools/system/plan9port | |
parent | 32b31398eb562152a11d1be992c5ea6e110013f5 (diff) | |
download | nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.gz nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.bz2 nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.lz nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.xz nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.zst nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.zip |
fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
Diffstat (limited to 'pkgs/tools/system/plan9port')
-rw-r--r-- | pkgs/tools/system/plan9port/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/system/plan9port/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 98b8ac7418b5..15fcdcf6c9dd 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -5,7 +5,7 @@ export PLAN9_TARGET=$PLAN9 configurePhase() { - echo CFLAGS=\"-I${fontconfig}/include -I${libXt_dev}/include\" > LOCAL.config + echo CFLAGS=\"-I${fontconfig_dev}/include -I${libXt_dev}/include\" > LOCAL.config echo X11=\"${libXt_dev}/include\" >> LOCAL.config for f in `grep -l -r /usr/local/plan9`; do diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 9833d81be1a2..70f792953b85 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -48,5 +48,5 @@ stdenv.mkDerivation rec { }; libXt_dev = libXt.dev; - inherit fontconfig; + fontconfig_dev = fontconfig.dev; } |