tilemaker: migrate to by-name

This commit is contained in:
Nikolay Korotkiy 2024-03-14 18:39:43 +04:00
parent e5c526b403
commit ec4b6bd72d
No known key found for this signature in database
GPG Key ID: D1DE6D7F693663A5
2 changed files with 2 additions and 6 deletions

View File

@ -6,7 +6,7 @@
, installShellFiles
, boost
, lua
, protobuf
, protobuf_21
, rapidjson
, shapelib
, sqlite
@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake installShellFiles ];
buildInputs = [ boost lua protobuf rapidjson shapelib sqlite zlib ];
buildInputs = [ boost lua protobuf_21 rapidjson shapelib sqlite zlib ];
cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
(lib.cmakeFeature "PROTOBUF_PROTOC_EXECUTABLE" "${buildPackages.protobuf}/bin/protoc");

View File

@ -35387,10 +35387,6 @@ with pkgs;
tijolo = callPackage ../applications/editors/tijolo { };
tilemaker = callPackage ../applications/misc/tilemaker {
protobuf = protobuf_21;
};
timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
fftw = fftwSinglePrec;
};