diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-05-09 10:07:54 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-05-09 10:07:54 -0500 |
| commit | cf63f2dde924dd4cdf95e92841296af539a5fcce (patch) | |
| tree | f978958b07adc5475c8fd49e66b275473e326854 /pkgs/applications/networking/dropbox/default.nix | |
| parent | f9a0e9c649a9c62d17886a655f870450fbc6ac59 (diff) | |
| download | nixpkgs-cf63f2dde924dd4cdf95e92841296af539a5fcce.tar nixpkgs-cf63f2dde924dd4cdf95e92841296af539a5fcce.tar.gz nixpkgs-cf63f2dde924dd4cdf95e92841296af539a5fcce.tar.bz2 nixpkgs-cf63f2dde924dd4cdf95e92841296af539a5fcce.tar.lz nixpkgs-cf63f2dde924dd4cdf95e92841296af539a5fcce.tar.xz nixpkgs-cf63f2dde924dd4cdf95e92841296af539a5fcce.tar.zst nixpkgs-cf63f2dde924dd4cdf95e92841296af539a5fcce.zip | |
dropbox: use makeQtWrapper
Diffstat (limited to 'pkgs/applications/networking/dropbox/default.nix')
| -rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index b9d45f90a5c..7895a3b252d 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf +{ stdenv, fetchurl, makeDesktopItem, patchelf , dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM , libX11, libXmu, ncurses, popt, qt5, zlib -, qtbase, qtdeclarative, qtwebkit +, qtbase, qtdeclarative, qtwebkit, makeQtWrapper }: # this package contains the daemon version of dropbox @@ -62,7 +62,7 @@ in stdenv.mkDerivation { sourceRoot = ".dropbox-dist"; - buildInputs = [ makeWrapper patchelf ]; + nativeBuildInputs = [ makeQtWrapper patchelf ]; dontPatchELF = true; # patchelf invoked explicitly below dontStrip = true; # already done @@ -102,7 +102,7 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" RPATH="${ldpath}:$out/${appdir}" - makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ + makeQtWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ --prefix LD_LIBRARY_PATH : "$RPATH" ''; |