JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ns-3: Fix hash for 3.33 and patch for upstream bug

Browse Source
This commit is contained in:
Rémy Grünblatt 2021-01-16 17:23:50 +01:00 committed by Matthieu Coudron
parent 22aff717db
commit 84d0ecfc5f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/science/networking/ns-3/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchFromGitLab , fetchFromGitLab
, fetchpatch
, python , python
, wafHook , wafHook
@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
owner = "nsnam"; owner = "nsnam";
repo = "ns-3-dev"; repo = "ns-3-dev";
rev = "ns-3.${version}"; rev = "ns-3.${version}";
sha256 = "158yjhsrmslj1q4zcq5p16hv9i82qnxx714l7idicncn0wzrfx7k"; sha256 = "0ds8h0f2qcb0gc2a8bk38cbhdb122i4sbg589bjn59rblzw0hkq4";
}; };
nativeBuildInputs = [ wafHook python ]; nativeBuildInputs = [ wafHook python ];
@ -97,6 +98,14 @@ stdenv.mkDerivation rec {
${pythonEnv.interpreter} ./test.py --nowaf ${pythonEnv.interpreter} ./test.py --nowaf
''; '';
patches = [
(fetchpatch {
name = "upstream-issue-336.patch";
url = "https://gitlab.com/nsnam/ns-3-dev/-/commit/673004edae1112e6cb249b698aad856d728530fb.patch";
sha256 = "0q96ividinbh9xlws014b2ir6gaavygnln5ca9m1db06m4vfwhng";
})
];
# strictoverflow prevents clang from discovering pyembed when bindings # strictoverflow prevents clang from discovering pyembed when bindings
hardeningDisable = [ "fortify" "strictoverflow"]; hardeningDisable = [ "fortify" "strictoverflow"];