diff options
| author | Nathan Zadoks <nathan@nathan7.eu> | 2016-12-03 17:59:00 -0500 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-25 00:01:53 +0200 |
| commit | 46991f88f70be9a8300f4e2f97af3eeeb38cf0f4 (patch) | |
| tree | df14257bbbcd552788576defdf0222da9fca51dd /pkgs/development/libraries/gnu-efi | |
| parent | 5c0a385e1cafb369529bb304ff8600c1f44b3fc3 (diff) | |
| download | nixpkgs-46991f88f70be9a8300f4e2f97af3eeeb38cf0f4.tar nixpkgs-46991f88f70be9a8300f4e2f97af3eeeb38cf0f4.tar.gz nixpkgs-46991f88f70be9a8300f4e2f97af3eeeb38cf0f4.tar.bz2 nixpkgs-46991f88f70be9a8300f4e2f97af3eeeb38cf0f4.tar.lz nixpkgs-46991f88f70be9a8300f4e2f97af3eeeb38cf0f4.tar.xz nixpkgs-46991f88f70be9a8300f4e2f97af3eeeb38cf0f4.tar.zst nixpkgs-46991f88f70be9a8300f4e2f97af3eeeb38cf0f4.zip | |
gnu-efi: fix discarded const qualifier on aarch64
Diffstat (limited to 'pkgs/development/libraries/gnu-efi')
| -rw-r--r-- | pkgs/development/libraries/gnu-efi/aarch64-fix-discarded-qualifier.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/gnu-efi/default.nix | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gnu-efi/aarch64-fix-discarded-qualifier.patch b/pkgs/development/libraries/gnu-efi/aarch64-fix-discarded-qualifier.patch new file mode 100644 index 00000000000..2295a4bb8a3 --- /dev/null +++ b/pkgs/development/libraries/gnu-efi/aarch64-fix-discarded-qualifier.patch @@ -0,0 +1,13 @@ +diff -ru gnu-efi-3.0.4-orig/lib/aarch64/initplat.c gnu-efi-3.0.4/lib/aarch64/initplat.c +--- gnu-efi-3.0.4-orig/lib/aarch64/initplat.c 2016-03-17 09:53:14.000000000 -0400 ++++ gnu-efi-3.0.4/lib/aarch64/initplat.c 2016-12-03 17:53:57.166575974 -0500 +@@ -41,7 +41,8 @@ + + void *memcpy(void *dest, const void *src, __SIZE_TYPE__ n) + { +- unsigned char *p = dest, *q = src; ++ unsigned char *p = dest; ++ const unsigned char *q = src; + + while (n--) + *p++ = *q++; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index d679d88e91d..aa644a3a4a8 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pciutils }: +{ stdenv, fetchurl, pciutils }: with stdenv.lib; stdenv.mkDerivation rec { name = "gnu-efi-${version}"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1bzq5czw5dxlvpgs9ij2iz7q6krwhja87vc982r6vffcqcl0982i"; }; + patches = optional stdenv.isAarch64 ./aarch64-fix-discarded-qualifier.patch; + buildInputs = [ pciutils ]; hardeningDisable = [ "stackprotector" ]; |