diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-26 22:04:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 22:04:04 +0200 |
| commit | d45fe1530fa0033c0b11e9d54791b0baa1b04893 (patch) | |
| tree | 782fd11c6b8efe34b4b271111040554f793159d6 /pkgs/applications | |
| parent | aeb401d9c6abdfa5a15708f3d4cf366dcaa4b577 (diff) | |
| parent | 9b69d5efd117d5bc14ecb661235dfde1315d9dc0 (diff) | |
| download | nixlib-d45fe1530fa0033c0b11e9d54791b0baa1b04893.tar nixlib-d45fe1530fa0033c0b11e9d54791b0baa1b04893.tar.gz nixlib-d45fe1530fa0033c0b11e9d54791b0baa1b04893.tar.bz2 nixlib-d45fe1530fa0033c0b11e9d54791b0baa1b04893.tar.lz nixlib-d45fe1530fa0033c0b11e9d54791b0baa1b04893.tar.xz nixlib-d45fe1530fa0033c0b11e9d54791b0baa1b04893.tar.zst nixlib-d45fe1530fa0033c0b11e9d54791b0baa1b04893.zip | |
Merge pull request #42628 from Synthetica9/atom-touchup
atom, atom-beta: nicer fix for #42618
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/atom/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 6efa831d2588..a77792254725 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: let - common = pname: {version, sha256, beta}: stdenv.mkDerivation rec { + common = pname: {version, sha256}: stdenv.mkDerivation rec { name = "${pname}-${version}"; inherit version; @@ -36,7 +36,7 @@ let --set-rpath "${atomEnv.libPath}" \ $share/resources/app/apm/bin/node patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/share/atom${lib.optionalString beta "-beta"}/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux + $share/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux dugite=$share/resources/app.asar.unpacked/node_modules/dugite rm -f $dugite/git/bin/git @@ -62,12 +62,10 @@ in stdenv.lib.mapAttrs common { atom = { version = "1.28.0"; sha256 = "0k09316897qb9ypkqm6w78nz7sj5385xfdm9bm97m8pka7v61g7h"; - beta = false; }; atom-beta = { version = "1.29.0-beta0"; sha256 = "05xk63wsjfssf8ckph2bgrxaf99fhz3gs8n8pira8cc9yjk7diz7"; - beta = true; }; } |