Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7eaba9af5e48
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a054d7450768
Choose a head ref
  • 2 commits
  • 1 file changed
  • 3 contributors

Commits on Nov 5, 2018

  1. meson: fix cross compilation of systemd 

    Co-authored-by: Robin Gloster <mail@glob.in>
    @globin @Ericson2314
    2 people authored and Ericson2314 committed Nov 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9e1b883 View commit details

  2. Merge pull request #48244 from volth/patch-257 

    meson: fix cross compilation of systemd
    @Ericson2314
    Ericson2314 authored Nov 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a054d74 View commit details
Showing with 10 additions and 10 deletions.
  1. +10 −10 pkgs/development/tools/build-managers/meson/default.nix
20 changes: 10 additions & 10 deletions pkgs/development/tools/build-managers/meson/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, python3Packages, stdenv, writeTextDir, substituteAll }:
{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:

python3Packages.buildPythonApplication rec {
version = "0.46.1";
@@ -47,20 +47,20 @@ 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 = '${targetPackages.stdenv.cc.targetPrefix}cc'
cpp = '${targetPackages.stdenv.cc.targetPrefix}c++'
ar = '${targetPackages.stdenv.cc.bintools.targetPrefix}ar'
strip = '${targetPackages.stdenv.cc.bintools.targetPrefix}strip'
pkgconfig = 'pkg-config'
[properties]
needs_exe_wrapper = true
[host_machine]
system = '${stdenv.targetPlatform.parsed.kernel.name}'
cpu_family = '${stdenv.targetPlatform.parsed.cpu.family}'
cpu = '${stdenv.targetPlatform.parsed.cpu.name}'
endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}'
cpu_family = '${targetPackages.stdenv.targetPlatform.parsed.cpu.family}'
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
@@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec {

inherit (stdenv) cc;

isCross = stdenv.buildPlatform != stdenv.hostPlatform;
isCross = stdenv.targetPlatform != stdenv.hostPlatform;

meta = with lib; {
homepage = http://mesonbuild.com;