Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pugixml: 1.9 -> 1.10 #102926

Merged
merged 1 commit into from Nov 6, 2020
Merged

pugixml: 1.9 -> 1.10 #102926

merged 1 commit into from Nov 6, 2020

Conversation

freezeboy
Copy link
Contributor

@freezeboy freezeboy commented Nov 5, 2020

Motivation for this change
  • split to multiple outputs when using the shared library version
  • enabled the tests
  • validate the pkg-config files
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

* split to multiple outputs when using the shared library version
* enabled the tests
* validate the pkg-config files
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

failures are broken on target branch

https://github.com/NixOS/nixpkgs/pull/102926
1 package marked as broken and skipped:
photoflow

1 package failed to build:
appleseed

13 packages built:
PlistCpp darktable filezilla gerbera gnss-sdr kodi-wayland kodiPlainWayland mudlet osl poedit pugixml waylandpp xib2nib

@jonringer jonringer merged commit e173880 into NixOS:master Nov 6, 2020
Comment on lines +28 to +30
export DYLD_LIBRARY_PATH="`pwd`''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
'' else ''
export LD_LIBRARY_PATH="`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
export DYLD_LIBRARY_PATH="`pwd`''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
'' else ''
export LD_LIBRARY_PATH="`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
'' else ''
export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"

@freezeboy
Copy link
Contributor Author

I have a doubt, do i open another pr with the suggestion?

@jonringer
Copy link
Contributor

go for it

cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ];
# Hack to be able to run the test, broken because we use
# CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
preBuild = if stdenv.isDarwin then ''
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if this is specific for tests, please do preCheck to avoid this affecting the build or install

@freezeboy freezeboy deleted the update-pugixml branch November 8, 2020 20:41
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 102926 run on x86_64-darwin 1

1 package marked as broken and skipped:
  • poedit
5 packages built:
  • PlistCpp
  • blender
  • darktable
  • pugixml
  • xib2nib

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants