mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 02:42:59 +00:00
571c71e6f7
We are migrating packages that meet below requirements: 1. using `callPackage` 2. called path is a directory 3. overriding set is empty (`{ }`) 4. not containing path expressions other than relative path (to makenixpkgs-vet happy) 5. not referenced by nix files outside of the directory, other than`pkgs/top-level/all-packages.nix` 6. not referencing nix files outside of the directory 7. not referencing `default.nix` (since it's changed to `package.nix`) 8. `outPath` doesn't change after migration The tool is here: https://github.com/Aleksanaa/by-name-migrate.
12 lines
654 B
Diff
12 lines
654 B
Diff
On gcc-10 -fno-common is the default which forbids miltiple definitions.
|
|
--- a/libgdome/xpath/gdome-xpath-xpnsresolv.h
|
|
+++ b/libgdome/xpath/gdome-xpath-xpnsresolv.h
|
|
@@ -42,6 +42,6 @@ void gdome_xpath_xpnsresolv_ref (GdomeXPathNSResolver *self, GdomeException *exc
|
|
void gdome_xpath_xpnsresolv_unref (GdomeXPathNSResolver *self, GdomeException *exc);
|
|
GdomeDOMString * gdome_xpath_xpnsresolv_lookupNamespaceURI( GdomeXPathNSResolver *self, GdomeDOMString *prefix, GdomeException *exc);
|
|
|
|
-const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab;
|
|
+extern const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab;
|
|
|
|
#endif /* GDOME_XPNSRESOLV_FILE */
|