diff options
| author | Maxwell Beck <max@ryt.one> | 2021-06-23 19:40:13 -0500 |
|---|---|---|
| committer | Maxwell Beck <max@ryt.one> | 2021-06-23 19:43:47 -0500 |
| commit | a1d1b7e2849b926ec2affdfad4814393a74b6f54 (patch) | |
| tree | 0c9ddc760ac2014db43bdaabc09d8927cb441334 /pkgs/development/libraries | |
| parent | de8a4f1741bbe8c5183219d9730a8798b183d29f (diff) | |
| download | nixpkgs-a1d1b7e2849b926ec2affdfad4814393a74b6f54.tar nixpkgs-a1d1b7e2849b926ec2affdfad4814393a74b6f54.tar.gz nixpkgs-a1d1b7e2849b926ec2affdfad4814393a74b6f54.tar.bz2 nixpkgs-a1d1b7e2849b926ec2affdfad4814393a74b6f54.tar.lz nixpkgs-a1d1b7e2849b926ec2affdfad4814393a74b6f54.tar.xz nixpkgs-a1d1b7e2849b926ec2affdfad4814393a74b6f54.tar.zst nixpkgs-a1d1b7e2849b926ec2affdfad4814393a74b6f54.zip | |
opencolorio_1: Remove top-level `with lib`
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/opencolorio/1.x.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 8908f486615..041ddf8e837 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -1,7 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, boost, pkg-config, lcms2, tinyxml, git }: -with lib; - stdenv.mkDerivation rec { pname = "opencolorio"; version = "1.1.1"; @@ -18,7 +16,7 @@ stdenv.mkDerivation rec { # TODO: Investigate whether git can be dropped: It's only used to apply patches nativeBuildInputs = [ cmake pkg-config git ]; - buildInputs = [ lcms2 tinyxml ] ++ optional stdenv.isDarwin boost; + buildInputs = [ lcms2 tinyxml ] ++ lib.optional stdenv.isDarwin boost; postPatch = '' substituteInPlace src/core/CMakeLists.txt --replace "-Werror" "" @@ -30,8 +28,8 @@ stdenv.mkDerivation rec { "-DUSE_EXTERNAL_TINYXML=ON" # External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 "-DUSE_EXTERNAL_YAML=OFF" - ] ++ optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON" - ++ optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DOCIO_USE_SSE=OFF"; + ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON" + ++ lib.optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DOCIO_USE_SSE=OFF"; postInstall = '' mkdir -p $bin/bin; mv $out/bin $bin/ |