diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:08:19 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:08:19 +0100 |
| commit | 5be0a9acd7b9abe4bff3202a7ac7defc17a37877 (patch) | |
| tree | 25491a83f604f1ace6a1170505955df5817495c2 /pkgs/tools/admin | |
| parent | f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf (diff) | |
| download | nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.gz nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.bz2 nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.lz nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.xz nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.zst nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.zip | |
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms "hostDrv" and "buildDrv" are not very intuitive, even if they're consistent with GNU terminology).
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index f74463b10635..e72ab4f90ca9 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { inherit fontDirectories; patchPhase = '' - sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.hostDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am - sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xkbcomp.hostDrv else xkbcomp}/bin";' unix/vncserver - sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.hostDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver + sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am + sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xkbcomp.crossDrv else xkbcomp}/bin";' unix/vncserver + sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver fontPath= for i in $fontDirectories; do @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = { - buildInputs = (map (x : x.hostDrv) (buildInputs ++ [ + buildInputs = (map (x : x.crossDrv) (buildInputs ++ [ fixesproto damageproto xcmiscproto bigreqsproto randrproto renderproto fontsproto videoproto compositeproto scrnsaverproto resourceproto libxkbfile libXfont libpciaccess xineramaproto |