diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-07-05 08:41:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 08:41:16 +0200 |
| commit | dfd30c69431d32848a4b95161f037c870d149eab (patch) | |
| tree | b91c4b9866978d5f1498b833c8a932af4cdd09ee /pkgs/applications/editors | |
| parent | 11c61ea63f403022635ebe2c7756c51f37e34a86 (diff) | |
| parent | b95b410d43d1432f2dec821dd953ad468557baca (diff) | |
| download | nixlib-dfd30c69431d32848a4b95161f037c870d149eab.tar nixlib-dfd30c69431d32848a4b95161f037c870d149eab.tar.gz nixlib-dfd30c69431d32848a4b95161f037c870d149eab.tar.bz2 nixlib-dfd30c69431d32848a4b95161f037c870d149eab.tar.lz nixlib-dfd30c69431d32848a4b95161f037c870d149eab.tar.xz nixlib-dfd30c69431d32848a4b95161f037c870d149eab.tar.zst nixlib-dfd30c69431d32848a4b95161f037c870d149eab.zip | |
Merge pull request #42769 from Synthetica9/atom-fix-42730
atom, atom-beta: fixed #42730
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 |