nur-packages

commit d4cda9bc543545615aa2a670573d0d374873c0df
parent 75573661bd34c6f562caf331d31ab1308bd73920
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Wed, 15 Jan 2020 10:09:30 +0300

Up

Diffstat:
M
nix/sources.json
 | 
6
+++---
M
pkgs/mapsoft/default.nix
 | 
6
+++---

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -197,10 +197,10 @@
         "homepage": "https://rcebits.com/lsd2dsl/index.html",
         "owner": "nongeneric",
         "repo": "lsd2dsl",
-        "rev": "f7bce9c9b331603e1c29b775ca674c06f2df250c",
-        "sha256": "1sxf8kqlnazbg48sy8sp2i54jrh5i2k88jwskvcy09h1608yzbx5",
+        "rev": "9700272c49ccf2658ab396d49b9098d685838f08",
+        "sha256": "0hs51ymh4pbmsz53ahrm7zkinxqlghbqyvavymkn59wflpm2hsxy",
         "type": "tarball",
-        "url": "https://github.com/nongeneric/lsd2dsl/archive/f7bce9c9b331603e1c29b775ca674c06f2df250c.tar.gz",
+        "url": "https://github.com/nongeneric/lsd2dsl/archive/9700272c49ccf2658ab396d49b9098d685838f08.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "lsdreader": {
diff --git a/pkgs/mapsoft/default.nix b/pkgs/mapsoft/default.nix
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace scripts/map_rescale \
-      --replace "/usr/share/mapsoft" "${mapsoft}/share/mapsoft"
+      --replace "/usr/share/mapsoft" "$out/share/mapsoft"
     substituteInPlace core/vmap/vmap_ocad.cpp \
-      --replace "/usr/share/mapsoft" "${mapsoft}/share/mapsoft"
+      --replace "/usr/share/mapsoft" "$out/share/mapsoft"
     substituteInPlace core/vmap/zn.cpp \
-      --replace "/usr/share/mapsoft" "${mapsoft}/share/mapsoft"
+      --replace "/usr/share/mapsoft" "$out/share/mapsoft"
   '';
 
   nativeBuildInputs = [