internal/rosa/package/x: move util-macros to tools

This is used by host autotools, so it should not be installed into the
cross sysroot.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 27 insertions, 41 deletions

diff --git a/internal/rosa/package/x.az b/internal/rosa/package/x.az
index b1fa9a73..aba67061 100644
--- a/internal/rosa/package/x.az
+++ b/internal/rosa/package/x.az
@@ -36,10 +36,9 @@ package libxtrans {
 		automake,
 		libtool,
 		pkgconf,
+		util-macros,
 	];
 
-	inputs = [ util-macros ];
-
 	unlikely = true;
 }
 
@@ -190,12 +189,12 @@ package libxcb-util {
 
 	exec = make {};
 
-	tools = [ pkgconf ];
-
-	inputs = [
+	tools = [
+		pkgconf,
 		util-macros,
-		xcb,
 	];
+
+	inputs = [ xcb ];
 }
 
 package libxcb-image {
@@ -230,12 +229,12 @@ package libxcb-render-util {
 
 	exec = make {};
 
-	tools = [ pkgconf ];
-
-	inputs = [
+	tools = [
+		pkgconf,
 		util-macros,
-		xcb,
 	];
+
+	inputs = [ xcb ];
 }
 
 package libX11 {
@@ -264,10 +263,10 @@ package libX11 {
 		automake,
 		libtool,
 		pkgconf,
+		util-macros,
 	];
 
 	inputs = [
-		util-macros,
 		libxtrans,
 		xorgproto,
 		xcb,
@@ -295,12 +294,10 @@ package libXext {
 		automake,
 		libtool,
 		pkgconf,
-	];
-
-	inputs = [
 		util-macros,
-		libX11,
 	];
+
+	inputs = [ libX11 ];
 }
 
 package libXfixes {
@@ -324,10 +321,10 @@ package libXfixes {
 		automake,
 		libtool,
 		pkgconf,
+		util-macros,
 	];
 
 	inputs = [
-		util-macros,
 		xorgproto,
 		libX11,
 	];
@@ -354,12 +351,10 @@ package libXrender {
 		automake,
 		libtool,
 		pkgconf,
-	];
-
-	inputs = [
 		util-macros,
-		libX11,
 	];
+
+	inputs = [ libX11 ];
 }
 
 package libxshmfence {
@@ -383,12 +378,10 @@ package libxshmfence {
 		automake,
 		libtool,
 		pkgconf,
-	];
-
-	inputs = [
 		util-macros,
-		xorgproto,
 	];
+
+	inputs = [ xorgproto ];
 }
 
 package libXxf86vm {
@@ -412,10 +405,10 @@ package libXxf86vm {
 		automake,
 		libtool,
 		pkgconf,
+		util-macros,
 	];
 
 	inputs = [
-		util-macros,
 		libXext,
 		xorgproto,
 	];
@@ -442,10 +435,10 @@ package libXrandr {
 		automake,
 		libtool,
 		pkgconf,
+		util-macros,
 	];
 
 	inputs = [
-		util-macros,
 		libXext,
 		libXrender,
 		xorgproto,
@@ -473,9 +466,8 @@ package font-util {
 		automake,
 		libtool,
 		pkgconf,
+		util-macros,
 	];
-
-	inputs = [ util-macros ];
 }
 
 package libfontenc {
@@ -500,12 +492,10 @@ package libfontenc {
 		libtool,
 		pkgconf,
 		font-util,
-	];
-
-	inputs = [
 		util-macros,
-		xorgproto,
 	];
+
+	inputs = [ xorgproto ];
 }
 
 package libxkbfile {
@@ -548,12 +538,10 @@ package xkbcomp {
 		libtool,
 		pkgconf,
 		byacc,
-	];
-
-	inputs = [
 		util-macros,
-		libxkbfile,
 	];
+
+	inputs = [ libxkbfile ];
 }
 
 package libXfont2 {
@@ -577,10 +565,10 @@ package libXfont2 {
 		automake,
 		libtool,
 		pkgconf,
+		util-macros,
 	];
 
 	inputs = [
-		util-macros,
 		freetype,
 		xorgproto,
 		libxtrans,
@@ -625,12 +613,10 @@ package libXdmcp {
 		automake,
 		libtool,
 		pkgconf,
-	];
-
-	inputs = [
 		util-macros,
-		xorgproto,
 	];
+
+	inputs = [ xorgproto ];
 }
 
 package xkeyboard-config {