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

dropbox: use makeQtWrapper

Browse Source
This commit is contained in:
Thomas Tuegel 2016-05-09 10:07:54 -05:00
parent f9a0e9c649
commit cf63f2dde9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf { stdenv, fetchurl, makeDesktopItem, patchelf
, dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM , dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM
, libX11, libXmu, ncurses, popt, qt5, zlib , libX11, libXmu, ncurses, popt, qt5, zlib
, qtbase, qtdeclarative, qtwebkit , qtbase, qtdeclarative, qtwebkit, makeQtWrapper
}: }:
# this package contains the daemon version of dropbox # this package contains the daemon version of dropbox
@ -62,7 +62,7 @@ in stdenv.mkDerivation {
sourceRoot = ".dropbox-dist"; sourceRoot = ".dropbox-dist";
buildInputs = [ makeWrapper patchelf ]; nativeBuildInputs = [ makeQtWrapper patchelf ];
dontPatchELF = true; # patchelf invoked explicitly below dontPatchELF = true; # patchelf invoked explicitly below
dontStrip = true; # already done dontStrip = true; # already done
@ -102,7 +102,7 @@ in stdenv.mkDerivation {
mkdir -p "$out/bin" mkdir -p "$out/bin"
RPATH="${ldpath}:$out/${appdir}" RPATH="${ldpath}:$out/${appdir}"
makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ makeQtWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
--prefix LD_LIBRARY_PATH : "$RPATH" --prefix LD_LIBRARY_PATH : "$RPATH"
''; '';