Skip to content

deja-dup: remove unneeded rpath wrapping#31219

Merged
Mic92 merged 1 commit intoNixOS:masterfrom
jtojnar:deja-dup-rpath
Nov 25, 2017
Merged

deja-dup: remove unneeded rpath wrapping#31219
Mic92 merged 1 commit intoNixOS:masterfrom
jtojnar:deja-dup-rpath

Conversation

@jtojnar
Copy link
Member

@jtojnar jtojnar commented Nov 4, 2017

Motivation for this change

Similarly to 9e37df1 and #31218, I cleaned up deja-dup. Unfortunately, deja-dup requires a custom library in $ORIGIN/../lib/deja-dup and meson for some reason adds $ORIGIN/../libdeja to the rpath (see #31222).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Nov 4, 2017
@jtojnar jtojnar force-pushed the deja-dup-rpath branch 2 times, most recently from 4ae9513 to 168900b Compare November 4, 2017 22:08
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Nov 4, 2017
@jtojnar jtojnar force-pushed the deja-dup-rpath branch 2 times, most recently from 957aaed to 8e0a782 Compare November 4, 2017 23:06
@jtojnar jtojnar changed the title [wip] deja-dup: remove unneeded rpath wrapping deja-dup: remove unneeded rpath wrapping Nov 8, 2017
@orivej orivej removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Nov 11, 2017
@jtojnar
Copy link
Member Author

jtojnar commented Nov 11, 2017

This can be further simplified when #31436 is merged.

@Mic92 Mic92 merged commit 60fd669 into NixOS:master Nov 25, 2017
@jtojnar jtojnar deleted the deja-dup-rpath branch November 26, 2017 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants