nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-22 21:53:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #238730 from alyssais/meson-1.1.1

Browse Source 
meson: 1.1.0 -> 1.1.1
This commit is contained in:
Nick Cao 2023-06-20 20:44:05 -06:00 committed by GitHub
commit 7e34ab6e28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -18,11 +18,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "meson";
version = "1.1.0";
version = "1.1.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-2WFsRM1sU2if+PBfxpWKaT8uF8NHKo2vg87lXav/gp8=";
hash = "sha256-0EtUH5fKQ5+4L6t9DUgJiL5L1OYlY6XKNfrbVAByexw=";
};
patches = [
@ -77,13 +77,6 @@ python3.pkgs.buildPythonApplication rec {
"docs/yaml/objects/dep.yaml"
];
})
# Fix regression in precomputing CMAKE_SIZEOF_VOID_P
# See https://github.com/mesonbuild/meson/pull/11761
(fetchpatch {
url = "https://github.com/mesonbuild/meson/commit/7c78c2b5a0314078bdabb998ead56925dc8b0fc0.patch";
sha256 = "sha256-vSnHhuOIXf/1X+bUkUmGND5b30ES0O8EDArwb4p2/w4=";
})
];
setupHook = ./setup-hook.sh;