diff options
Diffstat (limited to 'pkgs/applications/misc/mkgmap')
-rw-r--r-- | pkgs/applications/misc/mkgmap/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/mkgmap/splitter/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 0ef661333d6dd..15464c0e6a68e 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { cp ${fastutil} lib/compile/${fastutil.name} cp ${osmpbf} lib/compile/${osmpbf.name} cp ${protobuf} lib/compile/${protobuf.name} - '' + stdenv.lib.optionalString doCheck '' + '' + lib.optionalString doCheck '' mkdir -p lib/test cp ${fastutil} lib/test/${fastutil.name} cp ${osmpbf} lib/test/${osmpbf.name} @@ -51,7 +51,7 @@ stdenv.mkDerivation { cp ${hamcrest-core} lib/test/${hamcrest-core.name} mkdir -p test/resources/in/img - ${stdenv.lib.concatMapStringsSep "\n" (res: '' + ${lib.concatMapStringsSep "\n" (res: '' cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} '') testInputs} ''; @@ -70,7 +70,7 @@ stdenv.mkDerivation { cp -r dist/lib/ $out/share/java/mkgmap/ makeWrapper ${jre}/bin/java $out/bin/mkgmap \ --add-flags "-jar $out/share/java/mkgmap/mkgmap.jar" - '' + stdenv.lib.optionalString withExamples '' + '' + lib.optionalString withExamples '' mkdir -p $out/share/mkgmap cp -r dist/examples $out/share/mkgmap/ ''; diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 98f6379700eb2..6baf4f7630703 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation { cp ${osmpbf} lib/compile/${osmpbf.name} cp ${protobuf} lib/compile/${protobuf.name} cp ${xpp3} lib/compile/${xpp3.name} - '' + stdenv.lib.optionalString doCheck '' + '' + lib.optionalString doCheck '' mkdir -p lib/test cp ${junit} lib/test/${junit.name} cp ${hamcrest-core} lib/test/${hamcrest-core.name} mkdir -p test/resources/in/osm - ${stdenv.lib.concatMapStringsSep "\n" (res: '' + ${lib.concatMapStringsSep "\n" (res: '' cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} '') testInputs} ''; |