public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31219 from jtojnar/deja-dup-rpath

Browse Source 
deja-dup: remove unneeded rpath wrapping
This commit is contained in:
Jörg Thalheim 2017-11-25 15:56:57 +00:00 committed by GitHub
commit 60fd669cae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/applications/backup/deja-dup/default.nix
View File

@ -2,7 +2,7 @@
, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 , gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2
, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror , libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror
, appstream-glib, desktop_file_utils, atk, pango, duplicity , appstream-glib, desktop_file_utils, duplicity
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -44,29 +44,15 @@ stdenv.mkDerivation rec {
glib-compile-schemas $out/share/glib-2.0/schemas glib-compile-schemas $out/share/glib-2.0/schemas
''; '';
# Manual rpath definition until https://github.com/mesonbuild/meson/issues/314 is fixed postFixup = ''
postFixup = # Unwrap accidentally wrapped library
let mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so
rpath = stdenv.lib.makeLibraryPath [
glib
gtk3
gnome3.gnome_online_accounts
gnome3.libpeas
gnome3.nautilus
libgpgerror
libsecret
# Transitive
atk
pango
];
in ''
# Unwrap accidentally wrapped library
mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so
for elf in "$out"/bin/.*-wrapped "$out"/libexec/deja-dup/.deja-dup-monitor-wrapped "$out"/libexec/deja-dup/tools/*.so "$out"/lib/deja-dup/*.so "$out"/lib/nautilus/extensions-3.0/*.so; do # Patched meson does not add internal libraries to rpath
patchelf --set-rpath '${rpath}':"$out/lib/deja-dup" "$elf" for elf in "$out/bin/.deja-dup-wrapped" "$out/libexec/deja-dup/.deja-dup-monitor-wrapped" "$out/libexec/deja-dup/tools/libduplicity.so"; do
done patchelf --set-rpath "$(patchelf --print-rpath "$elf"):$out/lib/deja-dup" "$elf"
''; done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A simple backup tool"; description = "A simple backup tool";