summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-04-22 13:51:11 +0300
committerJakob Gillich <jakob@gillich.me>2016-04-22 16:10:51 +0200
commit6185f74531b1610fb0e71a4f057e6dbeeb116616 (patch)
tree9708aa849f360e1f8bdf82d92ec8ec019e5fcc24 /pkgs/top-level
parentb2426adf1cd3a21ab321c98e0753334a897436a7 (diff)
downloadnixpkgs-6185f74531b1610fb0e71a4f057e6dbeeb116616.tar
nixpkgs-6185f74531b1610fb0e71a4f057e6dbeeb116616.tar.gz
nixpkgs-6185f74531b1610fb0e71a4f057e6dbeeb116616.tar.bz2
nixpkgs-6185f74531b1610fb0e71a4f057e6dbeeb116616.tar.lz
nixpkgs-6185f74531b1610fb0e71a4f057e6dbeeb116616.tar.xz
nixpkgs-6185f74531b1610fb0e71a4f057e6dbeeb116616.tar.zst
nixpkgs-6185f74531b1610fb0e71a4f057e6dbeeb116616.zip
atom, electron, vscode: split dependencies to atomEnv
fixes #14890
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix13
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8a73642055..bba0883c923 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5700,10 +5700,7 @@ in
 
   astyle = callPackage ../development/tools/misc/astyle { };
 
-  electron = callPackage ../development/tools/electron {
-    gconf = pkgs.gnome.GConf;
-  };
-
+  electron = callPackage ../development/tools/electron { };
 
   autobuild = callPackage ../development/tools/misc/autobuild { };
 
@@ -11647,10 +11644,12 @@ in
 
   artha = callPackage ../applications/misc/artha { };
 
-  atom = callPackage ../applications/editors/atom {
+  atomEnv = callPackage ../applications/editors/atom/env.nix {
     gconf = gnome.GConf;
   };
 
+  atom = callPackage ../applications/editors/atom { };
+
   aseprite = callPackage ../applications/editors/aseprite {
     giflib = giflib_4_1;
   };
@@ -14253,9 +14252,7 @@ in
 
   vorbis-tools = callPackage ../applications/audio/vorbis-tools { };
 
-  vscode = callPackage ../applications/editors/vscode {
-    gconf = pkgs.gnome.GConf;
-  };
+  vscode = callPackage ../applications/editors/vscode { };
 
   vue = callPackage ../applications/misc/vue { };