diff options
| author | Christian Kampka <christian@kampka.net> | 2020-11-13 19:10:27 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-11-18 15:44:58 +0100 |
| commit | 9451ae5974fe55e38504980a447b178cdacbe639 (patch) | |
| tree | 82eff637c093f87d92c8b02dc1a4ba0effc69b68 /pkgs/development/libraries/gdbm | |
| parent | 6dd536a3cb57531aa1356743f2496f551f2bffe2 (diff) | |
gdbm: Fix multiple definitions error when building with clang
Diffstat (limited to 'pkgs/development/libraries/gdbm')
| -rw-r--r-- | pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch | 25 | ||||
| -rw-r--r-- | pkgs/development/libraries/gdbm/default.nix | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch b/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch new file mode 100644 index 000000000000..7583deb81098 --- /dev/null +++ b/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch @@ -0,0 +1,25 @@ +From 2c31a95d9e57a4308c5159c50e69b5c9178dee72 Mon Sep 17 00:00:00 2001 +From: Christian Kampka <christian@kampka.net> +Date: Fri, 13 Nov 2020 16:52:12 +0100 +Subject: [PATCH] Remove duplicate assignments + +--- + src/parseopt.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/parseopt.c b/src/parseopt.c +index 268e080..a4c8576 100644 +--- a/src/parseopt.c ++++ b/src/parseopt.c +@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin) + } + + char *parseopt_program_name; +-char *parseopt_program_doc; +-char *parseopt_program_args; + const char *program_bug_address = "<" PACKAGE_BUGREPORT ">"; + void (*parseopt_help_hook) (FILE *stream); + +-- +2.25.4 + diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 6cee01e799e7..3d333e503b2e 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { doCheck = true; # not cross; + patches = [ ./0001-Remove-duplicate-assignments.patch ]; + # Linking static stubs on cygwin requires correct ordering. # Consider upstreaming this. |