summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-04-22 04:14:21 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2016-04-22 04:21:33 +0200
commit008d47131f41248bd0917424871ac6dd126a3b09 (patch)
tree796498e6621fc70d4bf52d2880f67d679ca79a2b /pkgs/tools
parent672efb940f343ad0947b2d7fb125a6df38a5b079 (diff)
downloadnixpkgs-008d47131f41248bd0917424871ac6dd126a3b09.tar
nixpkgs-008d47131f41248bd0917424871ac6dd126a3b09.tar.gz
nixpkgs-008d47131f41248bd0917424871ac6dd126a3b09.tar.bz2
nixpkgs-008d47131f41248bd0917424871ac6dd126a3b09.tar.lz
nixpkgs-008d47131f41248bd0917424871ac6dd126a3b09.tar.xz
nixpkgs-008d47131f41248bd0917424871ac6dd126a3b09.tar.zst
nixpkgs-008d47131f41248bd0917424871ac6dd126a3b09.zip
Revert "torbrowser: fix torEnv after multiple-outputs"
This reverts commit 672efb940f343ad0947b2d7fb125a6df38a5b079.

This is a terrible fix, use buildEnv's extraOutputsToInstall instead.
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/security/tor/torbrowser.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 75cc832f85b..ef00a8538a9 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -6,9 +6,9 @@ let
   torEnv = buildEnv {
     name = "tor-env";
     paths = [
-      stdenv.cc.cc.lib zlib glib alsaLib dbus.lib dbus_glib gtk atk pango.out
-      freetype fontconfig.lib gdk_pixbuf cairo xorg.libXrender xorg.libX11
-      xorg.libXext xorg.libXt
+      stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
+      fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext
+      xorg.libXt
     ];
   };