diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-26 16:47:27 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-28 10:55:33 -0400 |
commit | 8245230753d260b61b928fad7e00323f38ca450f (patch) | |
tree | 57863834843f4cca0fcb9479763fc1f598a98d85 /pkgs/development/tools/build-managers | |
parent | 128b93e06142914a88c91f3c9f03ce52f6cb569e (diff) | |
download | nixlib-8245230753d260b61b928fad7e00323f38ca450f.tar nixlib-8245230753d260b61b928fad7e00323f38ca450f.tar.gz nixlib-8245230753d260b61b928fad7e00323f38ca450f.tar.bz2 nixlib-8245230753d260b61b928fad7e00323f38ca450f.tar.lz nixlib-8245230753d260b61b928fad7e00323f38ca450f.tar.xz nixlib-8245230753d260b61b928fad7e00323f38ca450f.tar.zst nixlib-8245230753d260b61b928fad7e00323f38ca450f.zip |
meson: Make target-agnostic
The cross file is added in the `mkDerivation`. It isn't nice putting build tool-specific stuff here, but our current architecture gives us little alternative.
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 28 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/meson/setup-hook.sh | 5 |
2 files changed, 0 insertions, 33 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 3fb435c5c2b2..3809d19e7d0c 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -3,20 +3,8 @@ , stdenv , writeTextDir , substituteAll -, targetPackages }: -let - # See https://mesonbuild.com/Reference-tables.html#cpu-families - cpuFamilies = { - aarch64 = "aarch64"; - armv5tel = "arm"; - armv6l = "arm"; - armv7l = "arm"; - i686 = "x86"; - x86_64 = "x86_64"; - }; -in python3Packages.buildPythonApplication rec { pname = "meson"; version = "0.54.0"; @@ -70,27 +58,11 @@ python3Packages.buildPythonApplication rec { setupHook = ./setup-hook.sh; - crossFile = writeTextDir "cross-file.conf" '' - [binaries] - pkgconfig = 'pkg-config' - - [properties] - needs_exe_wrapper = true - - [host_machine] - system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${cpuFamilies.${targetPackages.stdenv.targetPlatform.parsed.cpu.name}}' - cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}' - endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} - ''; - # 0.45 update enabled tests but they are failing doCheck = false; # checkInputs = [ ninja pkgconfig ]; # checkPhase = "python ./run_project_tests.py"; - isCross = stdenv.targetPlatform != stdenv.hostPlatform; - meta = with lib; { homepage = "https://mesonbuild.com"; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index aef18e65ea1f..3d946fcffd52 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -5,11 +5,6 @@ mesonConfigurePhase() { mesonFlags="--prefix=$prefix $mesonFlags" fi - # Build release by default. - if [ -n "@isCross@" ]; then - crossMesonFlags="--cross-file=@crossFile@/cross-file.conf" - fi - # See multiple-outputs.sh and meson’s coredata.py mesonFlags="\ --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ |