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: 64e19fdedae3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 64d50a009919
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 4, 2018

  1. meson: fix building with python 3.7

    @FRidh
    FRidh committed Nov 4, 2018
    Copy the full SHA
    64d50a0 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 pkgs/development/tools/build-managers/meson/default.nix
8 changes: 7 additions & 1 deletion 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, fetchpatch }:

python3Packages.buildPythonApplication rec {
version = "0.46.1";
@@ -41,6 +41,12 @@ python3Packages.buildPythonApplication rec {
src = ./fix-rpath.patch;
inherit (builtins) storeDir;
})

# Support Python 3.7. This is part of 0.47 and 0.48.1.
(fetchpatch {
url = https://github.com/mesonbuild/meson/commit/a87496addd9160300837aa50193f4798c6f1d251.patch;
sha256 = "1jfn9dgib5bc8frcd65cxn3fzhp19bpbjadxjkqzbjk1v4hdbl88";
})
];

setupHook = ./setup-hook.sh;