From 8b472e3739dbcb2fa832f936a665280996c6879d Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Thu, 29 Nov 2018 01:32:40 +0530 Subject: [PATCH] marp: 0.0.13 -> 0.0.14 * marp: 0.0.13 -> 0.0.14 (#50757) I think 0.0.13 never worked. The 0.0.14 download is weird. https://github.com/yhatt/marp/issues/258 --- pkgs/applications/office/marp/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index 6ff0cf1dfd05..cdda46d4837f 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -1,24 +1,29 @@ -{ stdenv, fetchurl, atomEnv, libXScrnSaver }: +{ stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }: stdenv.mkDerivation rec { name = "marp-${version}"; - version = "0.0.13"; + version = "0.0.14"; src = fetchurl { url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "1120mbw4mf7v4qfmss3121gkgp5pn31alk9cssxbrmdcsdkaq5ld"; + sha256 = "0nklzxwdx5llzfwz1hl2jpp2kwz78w4y63h5l00fh6fv6zisw6j4"; }; - sourceRoot = "."; + + unpackPhase = '' + mkdir {locales,resources} + tar --delay-directory-restore -xf $src + chmod u+x {locales,resources} + ''; installPhase = '' - mkdir -p $out/lib/marp $out/bin - cp -r ./* $out/lib/marp - ln -s $out/lib/marp/Marp $out/bin + mkdir -p $out/lib/marp $out/bin + cp -r ./* $out/lib/marp + ln -s $out/lib/marp/Marp $out/bin ''; postFixup = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}:$out/lib/marp" \ + --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libXScrnSaver gtk2 ]}:$out/lib/marp" \ $out/bin/Marp '';