summary refs log tree commit diff
path: root/pkgs/development/libraries/gnu-efi
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2017-02-05 09:34:31 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2017-02-05 09:34:31 +0200
commit321b639d766e3b221f1cbd4f13d44a6a11026178 (patch)
treef74714fc2519276c75fe6d87acf790cebaa7212c /pkgs/development/libraries/gnu-efi
parent8ba043a54033b8c57609c5b7408c3b25805aa0b6 (diff)
downloadnixpkgs-321b639d766e3b221f1cbd4f13d44a6a11026178.tar
nixpkgs-321b639d766e3b221f1cbd4f13d44a6a11026178.tar.gz
nixpkgs-321b639d766e3b221f1cbd4f13d44a6a11026178.tar.bz2
nixpkgs-321b639d766e3b221f1cbd4f13d44a6a11026178.tar.lz
nixpkgs-321b639d766e3b221f1cbd4f13d44a6a11026178.tar.xz
nixpkgs-321b639d766e3b221f1cbd4f13d44a6a11026178.tar.zst
nixpkgs-321b639d766e3b221f1cbd4f13d44a6a11026178.zip
gnu-efi: Remove unneeded aarch64 patch
Not needed after the upgrade to 3.0.5. Yay!
Diffstat (limited to 'pkgs/development/libraries/gnu-efi')
-rw-r--r--pkgs/development/libraries/gnu-efi/aarch64-fix-discarded-qualifier.patch13
-rw-r--r--pkgs/development/libraries/gnu-efi/default.nix2
2 files changed, 0 insertions, 15 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
deleted file mode 100644
index 2295a4bb8a3..00000000000
--- a/pkgs/development/libraries/gnu-efi/aarch64-fix-discarded-qualifier.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 6425749d041..c6240c40578 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "08hb2gpzcj5p743wcagm0j2m4gh100xv12llpbjc13zi2icwv3xx";
   };
 
-  patches = optional stdenv.isAarch64 ./aarch64-fix-discarded-qualifier.patch;
-
   buildInputs = [ pciutils ];
 
   hardeningDisable = [ "stackprotector" ];