diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/atom/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/atom/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/editors/atom/default.nix b/nixpkgs/pkgs/applications/editors/atom/default.nix index 35640965c6fa..e7a9a26f066c 100644 --- a/nixpkgs/pkgs/applications/editors/atom/default.nix +++ b/nixpkgs/pkgs/applications/editors/atom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, wrapGAppsHook, gvfs, gtk3, atomEnv }: +{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook, glib, gtk3, atomEnv }: let versions = { @@ -15,7 +15,7 @@ let }; common = pname: {version, sha256, beta ? null}: - let fullVersion = version + stdenv.lib.optionalString (beta != null) "-beta${toString beta}"; + let fullVersion = version + lib.optionalString (beta != null) "-beta${toString beta}"; name = "${pname}-${fullVersion}"; in stdenv.mkDerivation { inherit name; @@ -54,7 +54,8 @@ let preFixup = '' gappsWrapperArgs+=( - --prefix "PATH" : "${gvfs}/bin" + # needed for gio executable to be able to delete files + --prefix "PATH" : "${glib.bin}/bin" ) ''; @@ -81,7 +82,7 @@ let sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/share/applications/${pname}.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A hackable text editor for the 21st Century"; homepage = "https://atom.io/"; license = licenses.mit; @@ -89,4 +90,4 @@ let platforms = platforms.x86_64; }; }; -in stdenv.lib.mapAttrs common versions +in lib.mapAttrs common versions |