about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian McKenna <brian@brianmckenna.org>2018-11-29 01:32:40 +0530
committerRenaud <c0bw3b@users.noreply.github.com>2018-11-28 21:02:40 +0100
commit8b472e3739dbcb2fa832f936a665280996c6879d (patch)
tree16ef83f6cf8daa4059a81f538c52910810ae64de
parent44f2569e50c60e6e0a0db600897e3c523708b1bd (diff)
downloadnixlib-8b472e3739dbcb2fa832f936a665280996c6879d.tar
nixlib-8b472e3739dbcb2fa832f936a665280996c6879d.tar.gz
nixlib-8b472e3739dbcb2fa832f936a665280996c6879d.tar.bz2
nixlib-8b472e3739dbcb2fa832f936a665280996c6879d.tar.lz
nixlib-8b472e3739dbcb2fa832f936a665280996c6879d.tar.xz
nixlib-8b472e3739dbcb2fa832f936a665280996c6879d.tar.zst
nixlib-8b472e3739dbcb2fa832f936a665280996c6879d.zip
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

-rw-r--r--pkgs/applications/office/marp/default.nix21
1 files 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
   '';