From 86d3c33475f06b1de19679c20399f076a3c1148a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Dec 2019 21:57:04 +0100
Subject: [PATCH] osm2xmap: clean up
Do not use DESTDIR and bring makeFlags more in line with the Makefile:
https://github.com/sembruk/osm2xmap/blob/a5f9ceadf0b06c034850fb22c55f2be4dd43eaef/Makefile
---
pkgs/applications/misc/osm2xmap/default.nix | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix
index 8ffc8ec69fe..1c19238541c 100644
--- a/pkgs/applications/misc/osm2xmap/default.nix
+++ b/pkgs/applications/misc/osm2xmap/default.nix
@@ -12,18 +12,15 @@ stdenv.mkDerivation rec {
};
makeFlags = [
- "GIT_VERSION=$(version)"
+ "GIT_VERSION=${version}"
"GIT_TIMESTAMP="
- "SHAREDIR=$(out)/share/"
- "INSTALL_BINDIR=$(out)/bin"
- "INSTALL_MANDIR=$(out)/share/man/man1"
- "INSTALL_SHAREDIR=$(out)/share/"
+ "SHAREDIR=${placeholder ''out''}/share/osm2xmap"
+ "INSTALL_BINDIR=${placeholder ''out''}/bin"
+ "INSTALL_MANDIR=${placeholder ''out''}/share/man/man1"
];
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
- installFlags = [ "DESTDIR=$(out)" ];
-
buildInputs = [ libroxml proj libyamlcpp boost ];
meta = with stdenv.lib; {