diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-12-12 00:56:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-12 00:56:12 +0000 |
| commit | d66c960c2346496c52960c963ecf32b44b587b54 (patch) | |
| tree | 4d399b21a2b145abdf5d4677527174bdd63f538d /pkgs/development | |
| parent | 3a621ab787998cfa499db120fd89851b81e9b8d5 (diff) | |
| parent | fbb114107d7fae6c0488cc7cc30d4786fc1dd9c6 (diff) | |
| download | nixlib-d66c960c2346496c52960c963ecf32b44b587b54.tar nixlib-d66c960c2346496c52960c963ecf32b44b587b54.tar.gz nixlib-d66c960c2346496c52960c963ecf32b44b587b54.tar.bz2 nixlib-d66c960c2346496c52960c963ecf32b44b587b54.tar.lz nixlib-d66c960c2346496c52960c963ecf32b44b587b54.tar.xz nixlib-d66c960c2346496c52960c963ecf32b44b587b54.tar.zst nixlib-d66c960c2346496c52960c963ecf32b44b587b54.zip | |
Merge pull request #51154 from Mic92/cross-fixes
Various cross-compilation fixes
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/libpfm/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/wayland/default.nix | 17 |
3 files changed, 21 insertions, 4 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 5a11d03c5917..59ffd47c3104 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" ''; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index ffd195b6462d..36e99c8cd911 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; { diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 866b1232aef5..c694cc7b4452 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" ]; - - nativeBuildInputs = [ pkgconfig ]; + configureFlags = [ + "--disable-documentation" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "--with-host-scanner" + ]; + + nativeBuildInputs = [ + pkgconfig + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + # for wayland-scanner during build + wayland + ]; buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ]; |