diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 12:42:41 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 14:24:03 +0700 |
commit | 108bdac3d99b6d94d3740422af5945e510238304 (patch) | |
tree | dd91cf11f7c29bbd4542f5bdab986430025c02e2 /pkgs/applications/misc/mkgmap/default.nix | |
parent | 2e34288f0d8cf01eea228c7dbc50af9589b885f3 (diff) | |
download | nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.gz nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.bz2 nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.lz nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.xz nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.tar.zst nixpkgs-108bdac3d99b6d94d3740422af5945e510238304.zip |
pkgs/applications: stdenv.lib -> lib
Diffstat (limited to 'pkgs/applications/misc/mkgmap/default.nix')
-rw-r--r-- | pkgs/applications/misc/mkgmap/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 0ef661333d6..15464c0e6a6 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/ ''; |