From 4b6bdc29b0b7f1c3cc2b4952c2774a8baccd45a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 20 Nov 2018 21:44:23 +0000 Subject: [PATCH 1/3] libpfm: fix cross compilation --- pkgs/development/libraries/libpfm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index ffd195b6462..36e99c8cd91 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; + makeFlags = [ + "ARCH=${stdenv.targetPlatform.uname.processor}" + "SYS=${stdenv.targetPlatform.uname.system}" + ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; meta = with stdenv.lib; { From f17ff7d6efa1727bb6fa1c33d9f7af3229d94083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Nov 2018 07:11:23 +0000 Subject: [PATCH 2/3] freetype: fix cross-build --- pkgs/development/libraries/freetype/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 5a11d03c591..59ffd47c310 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -62,6 +62,9 @@ in stdenv.mkDerivation rec { doCheck = true; postInstall = glib.flattenInclude + '' + substituteInPlace $dev/bin/freetype-config \ + --replace ${buildPackages.pkgconfig} ${pkgconfig} + wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" ''; From fbb114107d7fae6c0488cc7cc30d4786fc1dd9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Nov 2018 07:12:45 +0000 Subject: [PATCH 3/3] wayland: fix cross-build --- pkgs/development/libraries/wayland/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 866b1232aef..c694cc7b445 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, libxml2 +, libffi, libxml2, wayland , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: @@ -15,9 +15,18 @@ stdenv.mkDerivation rec { sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf"; }; - configureFlags = [ "--with-scanner" "--disable-documentation" ]; + configureFlags = [ + "--disable-documentation" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "--with-host-scanner" + ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + # for wayland-scanner during build + wayland + ]; buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ];