diff options
author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-04-19 10:25:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-19 10:25:51 -0500 |
commit | 12a3590cc7771bb8f5a48ae4aec16e056d17aa56 (patch) | |
tree | abd7f7ca9addfe7916bd1a55cd619d73b5b2b5d1 /pkgs/applications/networking/dropbox | |
parent | 553bf09ba9d053c3660091113216e0f1481030ec (diff) | |
parent | c4c33eaca1c0b74c4f2d218c713bb9879d55b1b5 (diff) |
Merge pull request #25019 from peterhoeg/f/db
dropbox: use wmctrl from nixpkgs
Diffstat (limited to 'pkgs/applications/networking/dropbox')
-rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 93d2ec93aca8f..db14e2b841f19 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, makeDesktopItem, patchelf, makeWrapper +{ stdenv, fetchurl, makeDesktopItem, patchelf, makeWrapper, makeQtWrapper , dbus_libs, fontconfig, freetype, gcc, glib , libdrm, libffi, libICE, libSM , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb , libxml2, libxslt, ncurses, zlib -, qtbase, qtdeclarative, qtwebkit, makeQtWrapper +, qtbase, qtdeclarative, qtwebkit, wmctrl }: # this package contains the daemon version of dropbox @@ -98,6 +98,9 @@ in stdenv.mkDerivation { --prefix LD_LIBRARY_PATH : "$RPATH" chmod 755 $out/${appdir}/dropbox + + rm $out/${appdir}/wmctrl + ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl ''; fixupPhase = '' |