Merge pull request #20298 from NeQuissimus/atom_1_12_0

atom: 1.11.2 -> 1.12.0
This commit is contained in:
Franz Pletz 2016-11-10 02:13:54 +01:00 committed by GitHub
commit 58bda5e9a3

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv }: { stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv, libXScrnSaver, libxkbfile }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atom-${version}"; name = "atom-${version}";
version = "1.11.2"; version = "1.12.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
sha256 = "1mvlj1j0hyvm5di95nn0x99lm5arw2amm1s1va1m73zss3bzlhpm"; sha256 = "0grl5lw05gjw9381pr8asgqp9f912li28v0bvl8j6i0ynfy67jmk";
name = "${name}.deb"; name = "${name}.deb";
}; };
@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
rm -r $out/share/lintian rm -r $out/share/lintian
rm -r $out/usr/ rm -r $out/usr/
wrapProgram $out/bin/atom \ wrapProgram $out/bin/atom \
--prefix "PATH" : "${gvfs}/bin" --prefix "PATH" : "${gvfs}/bin" \
--prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
--prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libxkbfile ]}/libxkbfile.so.1
fixupPhase fixupPhase