mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-23 05:14:45 +00:00
Merge pull request #311491 from wegank/cpp-utilities-fix
cpp-utilities: fix build on x86_64-darwin
This commit is contained in:
commit
ddc6443733
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, cppunit
|
||||
, iconv
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeCheckInputs = [ cppunit ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
iconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4
|
||||
libiconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4
|
||||
];
|
||||
|
||||
cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"];
|
||||
|
Loading…
Reference in New Issue
Block a user