mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 17:03:01 +00:00
tilemaker: migrate to by-name
This commit is contained in:
parent
e5c526b403
commit
ec4b6bd72d
@ -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");
|
@ -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;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user