diff options
| author | Lengyel Balazs <ikervagyok@gmail.com> | 2018-12-31 04:40:47 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-01-04 14:38:57 +0100 |
| commit | f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9 (patch) | |
| tree | e7ce232c1bce855e2752534bd615b3a2383990a2 /pkgs/tools/system | |
| parent | 51d6b1bdece85e0d136e91b7cead120240698a8c (diff) | |
| download | nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.gz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.bz2 nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.lz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.xz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.zst nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.zip | |
treewide/xorg: replace *proto with xorgproto
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/plan9port/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/plan9port/default.nix | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 7729bae897c0..c0d7134bcc59 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_dev}/include -I${xproto_exp}/include -I${xextproto_exp}/include -I${libX11_dev}/include -I${libXt_dev}/include -I${libXext_dev}/include -I${freetype_dev}/include -I${zlib_dev}/include\" > LOCAL.config - echo LDFLAGS=\"-L${fontconfig_lib}/lib -L${xproto_exp}/lib -L${xextproto_exp}/lib -L${libX11_exp}/lib -L${libXt_exp}/lib -L${libXext_exp}/lib -L${freetype_exp}/lib -L${zlib_exp}/lib\" >> LOCAL.config + echo CFLAGS=\"-I${fontconfig_dev}/include -I${xorgproto_exp}/include -I${libX11_dev}/include -I${libXt_dev}/include -I${libXext_dev}/include -I${freetype_dev}/include -I${zlib_dev}/include\" > LOCAL.config + echo LDFLAGS=\"-L${fontconfig_lib}/lib -L${xorgproto_exp}/lib -L${libX11_exp}/lib -L${libXt_exp}/lib -L${libXext_exp}/lib -L${freetype_exp}/lib -L${zlib_exp}/lib\" >> 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 c71c70b57a7a..83b006e786f1 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchgit, which, libX11, libXt, fontconfig, freetype -, xproto ? null -, xextproto ? null +, xorgproto ? null , libXext ? null , zlib ? null # For building web manuals @@ -45,9 +44,8 @@ stdenv.mkDerivation rec { perl libX11 fontconfig - xproto + xorgproto libXt - xextproto libXext freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam. ]; @@ -69,8 +67,7 @@ stdenv.mkDerivation rec { freetype_dev = freetype.dev; zlib_dev = zlib.dev; - xproto_exp = xproto; - xextproto_exp = xextproto; + xorgproto_exp = xorgproto; libX11_exp = libX11; libXt_exp = libXt; libXext_exp = libXext; |