diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/opencollada/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/opencollada/default.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/opencollada/default.nix b/nixpkgs/pkgs/development/libraries/opencollada/default.nix index 388c473125b8..d05822174339 100644 --- a/nixpkgs/pkgs/development/libraries/opencollada/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencollada/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libxml2, pcre , darwin}: stdenv.mkDerivation rec { @@ -13,14 +13,11 @@ stdenv.mkDerivation rec { sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); propagatedBuildInputs = [ libxml2 pcre ]; - enableParallelBuilding = true; - patchPhase = '' patch -p1 < ${./pcre.patch} '' + lib.optionalString stdenv.isDarwin '' @@ -31,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "A library for handling the COLLADA file format"; homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; }; } |