Skip to content

Instantly share code, notes, and snippets.

@exarkun
Created January 2, 2019 21:05
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save exarkun/6f1b7cfb3fdd256049e3d1da11bccc60 to your computer and use it in GitHub Desktop.
Save exarkun/6f1b7cfb3fdd256049e3d1da11bccc60 to your computer and use it in GitHub Desktop.
systemd.patch
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 35ae59af617..d8ee00fa5af 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -4,6 +4,8 @@ python3Packages.buildPythonApplication rec {
version = "0.46.1";
pname = "meson";
+ junk = builtins.trace ("${stdenv.buildPlatform.config} ${stdenv.hostPlatform.config} ${stdenv.targetPlatform.config}") "junk";
+
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
@@ -47,10 +49,10 @@ python3Packages.buildPythonApplication rec {
crossFile = writeTextDir "cross-file.conf" ''
[binaries]
- c = '${stdenv.cc.targetPrefix}cc'
- cpp = '${stdenv.cc.targetPrefix}c++'
- ar = '${stdenv.cc.bintools.targetPrefix}ar'
- strip = '${stdenv.cc.bintools.targetPrefix}strip'
+ c = 'armv6l-unknown-linux-gnueabihf-cc'
+ cpp = 'armv6l-unknown-linux-gnueabihf-c++'
+ ar = 'armv6l-unknown-linux-gnueabihf-ar'
+ strip = 'armv6l-unknown-linux-gnueabihf-strip'
pkgconfig = 'pkg-config'
[properties]
@@ -70,7 +72,7 @@ python3Packages.buildPythonApplication rec {
inherit (stdenv) cc;
- isCross = stdenv.buildPlatform != stdenv.hostPlatform;
+ isCross = stdenv.hostPlatform != stdenv.targetPlatform;
meta = with lib; {
homepage = http://mesonbuild.com;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment