Skip to content

Commit

Permalink
xorg.*: fix cross m4 handling
Browse files Browse the repository at this point in the history
  • Loading branch information
@globin
globin committed May 7, 2019
1 parent 5448f6c commit 4a246ce
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 22 deletions.
42 changes: 21 additions & 21 deletions pkgs/servers/x11/xorg/default.nix
View file
Expand Up @@ -1430,94 +1430,94 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};

xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-0.4.0";
builder = ./builder.sh;
src = fetchurl {
url = https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2;
sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};

xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto }: stdenv.mkDerivation {
xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-cursor-0.1.3";
builder = ./builder.sh;
src = fetchurl {
url = https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2;
sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};

xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xorgproto }: stdenv.mkDerivation {
xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-errors-1.0";
builder = ./builder.sh;
src = fetchurl {
url = https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2;
sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xcbproto xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xcbproto xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};

xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutil, xorgproto }: stdenv.mkDerivation {
xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-image-0.4.0";
builder = ./builder.sh;
src = fetchurl {
url = https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2;
sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xcbutil xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xcbutil xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};

xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-keysyms-0.4.0";
builder = ./builder.sh;
src = fetchurl {
url = https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2;
sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};

xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-renderutil-0.3.9";
builder = ./builder.sh;
src = fetchurl {
url = https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2;
sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};

xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation {
name = "xcb-util-wm-0.4.1";
builder = ./builder.sh;
src = fetchurl {
url = https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2;
sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf m4 libxcb xorgproto ];
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ gperf libxcb xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};

Expand Down
3 changes: 2 additions & 1 deletion pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View file
Expand Up @@ -229,7 +229,8 @@

push @nativeRequires, "gettext" if $file =~ /USE_GETTEXT/;
push @requires, "libxslt" if $pkg =~ /libxcb/;
push @requires, "gperf", "m4", "xorgproto" if $pkg =~ /xcbutil/;
push @nativeRequires, "m4" if $pkg =~ /xcbutil/;
push @requires, "gperf", "xorgproto" if $pkg =~ /xcbutil/;

print "REQUIRES $pkg => @requires\n";
print "NATIVE_REQUIRES $pkg => @nativeRequires\n";
Expand Down

0 comments on commit 4a246ce

Please sign in to comment.