From 572490bce93a34e7b0dc448bd71cac8f1a42cf00 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 12 Aug 2016 15:23:00 +0000 Subject: [PATCH] udftools: remove obsolete gcc5 patch fixed by setting C compiler standard --- pkgs/tools/filesystems/udftools/default.nix | 2 -- pkgs/tools/filesystems/udftools/gcc5.patch | 17 ----------------- 2 files changed, 19 deletions(-) delete mode 100644 pkgs/tools/filesystems/udftools/gcc5.patch diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index 75e37f77949d..b912bab68260 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline ]; - patches = [ ./gcc5.patch ]; - hardeningDisable = [ "fortify" ]; NIX_CFLAGS_COMPILE = "-std=gnu90"; diff --git a/pkgs/tools/filesystems/udftools/gcc5.patch b/pkgs/tools/filesystems/udftools/gcc5.patch deleted file mode 100644 index 2c57ff20e135..000000000000 --- a/pkgs/tools/filesystems/udftools/gcc5.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- udftools-1.0.0b3/libudffs/desc.c 2016-02-07 23:21:38.595391610 +0000 -+++ udftools-1.0.0b3/libudffs/desc.c 2016-02-07 23:21:57.759756269 +0000 -@@ -34,12 +34,12 @@ - #include "libudffs.h" - #include "config.h" - --inline struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *disc) -+extern struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *disc) - { - return (struct impUseVolDescImpUse *)disc->udf_iuvd[0]->impUse; - } - --inline struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *disc) -+extern struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *disc) - { - return (struct logicalVolIntegrityDescImpUse *)&(disc->udf_lvid->impUse[le32_to_cpu(disc->udf_lvd[0]->numPartitionMaps) * 2 * sizeof(uint32_t)]); - }