diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-11 23:26:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 23:26:47 +0100 |
| commit | 10c6439a8998466266ff6f440c0716ae8b9b1a84 (patch) | |
| tree | 113b8f02c6be317abbc1ab6f5251c278527a075a /pkgs | |
| parent | 1566b47c21bf89128c6324c39fab1970072ca8fe (diff) | |
| parent | ed559bf5d31e5c0d69f44a91e1dc34ba2d14d31a (diff) | |
| download | nixlib-10c6439a8998466266ff6f440c0716ae8b9b1a84.tar nixlib-10c6439a8998466266ff6f440c0716ae8b9b1a84.tar.gz nixlib-10c6439a8998466266ff6f440c0716ae8b9b1a84.tar.bz2 nixlib-10c6439a8998466266ff6f440c0716ae8b9b1a84.tar.lz nixlib-10c6439a8998466266ff6f440c0716ae8b9b1a84.tar.xz nixlib-10c6439a8998466266ff6f440c0716ae8b9b1a84.tar.zst nixlib-10c6439a8998466266ff6f440c0716ae8b9b1a84.zip | |
Merge pull request #33756 from acowley/pngpp-darwin
pngpp: darwin support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/png++/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 6ca4734a4f7d..ef4b3ea7e010 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -21,13 +21,17 @@ stdenv.mkDerivation rec { postCheck = "cat test/test.log"; - buildInputs = [ ] - ++ stdenv.lib.optional docSupport doxygen; + buildInputs = stdenv.lib.optional docSupport doxygen; propagatedBuildInputs = [ libpng ]; - makeFlags = [ "PREFIX=\${out}" ] - ++ stdenv.lib.optional docSupport "docs"; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace error.hpp --replace "#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" "#if (__clang__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" + '' + '' + sed "s|\(PNGPP := .\)|PREFIX := ''${out}\n\\1|" -i Makefile + ''; + + makeFlags = stdenv.lib.optional docSupport "docs"; enableParallelBuilding = true; @@ -35,7 +39,7 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/pngpp/; description = "C++ wrapper for libpng library"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.ramkromberg ]; }; } |