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

dropbox: use bundled librsync (working)

Browse Source
This commit is contained in:
Thomas Tuegel 2015-02-24 11:12:56 -06:00
parent bd6a15d6d3
commit f12536f151
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/networking/dropbox/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper { stdenv, fetchurl, makeDesktopItem, makeWrapper
, dbus_libs, gcc, glib, libdrm, libffi, libICE, librsync, libSM , dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM
, libX11, libXmu, ncurses, popt, qt5, zlib , libX11, libXmu, ncurses, popt, qt5, zlib
}: }:
@ -9,10 +9,13 @@
# note: the resulting program has to be invoced as # note: the resulting program has to be invoced as
# 'dropbox' because the internal python engine takes # 'dropbox' because the internal python engine takes
# uses the name of the program as starting point. # uses the name of the program as starting point.
#
# todo: dropbox is shipped with some copies of libraries. # Dropbox ships with its own copies of some libraries.
# replace these libraries with the appropriate ones in # Unfortunately, upstream makes changes to the source of
# nixpkgs. # some libraries, rendering them incompatible with the
# open-source versions. Wherever possible, we must try
# to make the bundled libraries work, rather than replacing
# them with our own.
let let
arch = if stdenv.system == "x86_64-linux" then "x86_64" arch = if stdenv.system == "x86_64-linux" then "x86_64"
@ -33,7 +36,7 @@ let
ldpath = stdenv.lib.makeSearchPath "lib" ldpath = stdenv.lib.makeSearchPath "lib"
[ [
dbus_libs gcc glib libdrm libffi libICE librsync libSM libX11 dbus_libs gcc glib libdrm libffi libICE libSM libX11
libXmu ncurses popt qt5.base qt5.declarative qt5.webkit libXmu ncurses popt qt5.base qt5.declarative qt5.webkit
zlib zlib
]; ];
@ -86,7 +89,6 @@ in stdenv.mkDerivation {
rm "$out/${appdir}/libQt5WebKit.so.5" rm "$out/${appdir}/libQt5WebKit.so.5"
rm "$out/${appdir}/libQt5WebKitWidgets.so.5" rm "$out/${appdir}/libQt5WebKitWidgets.so.5"
rm "$out/${appdir}/libQt5Widgets.so.5" rm "$out/${appdir}/libQt5Widgets.so.5"
rm "$out/${appdir}/librsync.so.1"
rm "$out/${appdir}/libX11-xcb.so.1" rm "$out/${appdir}/libX11-xcb.so.1"
rm "$out/${appdir}/qt.conf" rm "$out/${appdir}/qt.conf"