diff options
| author | Patrick Hilhorst <git@hilhorst.be> | 2018-06-29 15:10:17 +0200 |
|---|---|---|
| committer | Patrick Hilhorst <git@hilhorst.be> | 2018-06-29 15:10:17 +0200 |
| commit | b95b410d43d1432f2dec821dd953ad468557baca (patch) | |
| tree | 1812116c0d9bc3a0c86f741d6434354628979ee0 /pkgs/applications/editors | |
| parent | fdfe5b028bd4da08f0c8aabf9fb5e143ce96c56f (diff) | |
| download | nixlib-b95b410d43d1432f2dec821dd953ad468557baca.tar nixlib-b95b410d43d1432f2dec821dd953ad468557baca.tar.gz nixlib-b95b410d43d1432f2dec821dd953ad468557baca.tar.bz2 nixlib-b95b410d43d1432f2dec821dd953ad468557baca.tar.lz nixlib-b95b410d43d1432f2dec821dd953ad468557baca.tar.xz nixlib-b95b410d43d1432f2dec821dd953ad468557baca.tar.zst nixlib-b95b410d43d1432f2dec821dd953ad468557baca.zip | |
atom, atom-beta: fixed #42730
Swithed atom to use gtk3 instead of 2. Fixed channel detection in the atom startup script.
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/atom/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/editors/atom/env.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index a77792254725..233be8ac73b2 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -21,6 +21,7 @@ let mv $out/usr/* $out/ rm -r $out/share/lintian rm -r $out/usr/ + sed -i "s/${pname})/.${pname}-wrapped)/" $out/bin/${pname} # sed -i "s/'${pname}'/'.${pname}-wrapped'/" $out/bin/${pname} wrapProgram $out/bin/${pname} \ --prefix "PATH" : "${gvfs}/bin" diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index c7e1dfe27364..f93d4042a622 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig +{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 + stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr |