nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-24 13:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

ninja: 1.11.1 -> 1.12.0

Browse Source 
Remove patch for files in large fs, since it is merged to v1.12.0
This commit is contained in:
John Titor 2024-04-11 23:19:57 +05:30
parent 493d74ef4a
commit 4852dc6479
No known key found for this signature in database
GPG Key ID: 29B0514F4E3C1CC0
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/by-name/ni/ninja/package.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, asciidoc , asciidoc
, docbook_xml_dtd_45 , docbook_xml_dtd_45
, docbook_xsl , docbook_xsl
@ -15,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ninja"; pname = "ninja";
version = "1.11.1"; version = "1.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ninja-build"; owner = "ninja-build";
repo = "ninja"; repo = "ninja";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; hash = "sha256-ewMn735TJTiQZYk3Y7QxNLRnKh6xdRUcdJzCX+HCmEo=";
}; };
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
@ -38,15 +37,6 @@ stdenv.mkDerivation rec {
libxslt.bin libxslt.bin
]; ];
patches = lib.optionals stdenv.is32bit [
# Otherwise ninja may fail on some files in a larger FS.
(fetchpatch {
name = "stat64.patch";
url = "https://github.com/ninja-build/ninja/commit/7bba11ae704efc84cac5fde5e9be53f653f237d1.diff";
hash = "sha256-tINS57xLh1lwnYFWCQs5OudfgtIShaOh5zbmv7w5BnQ=";
})
];
postPatch = '' postPatch = ''
# write rebuild args to file after bootstrap # write rebuild args to file after bootstrap
substituteInPlace configure.py --replace "subprocess.check_call(rebuild_args)" "open('rebuild_args','w').write(rebuild_args[0])" substituteInPlace configure.py --replace "subprocess.check_call(rebuild_args)" "open('rebuild_args','w').write(rebuild_args[0])"