diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/agg | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/agg')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/agg/default.nix | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/agg/default.nix b/nixpkgs/pkgs/development/libraries/agg/default.nix index 39e27c909b50..bfa7449b04c6 100644 --- a/nixpkgs/pkgs/development/libraries/agg/default.nix +++ b/nixpkgs/pkgs/development/libraries/agg/default.nix @@ -8,8 +8,18 @@ stdenv.mkDerivation rec { url = "https://www.antigrain.com/${pname}-${version}.tar.gz"; sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake libtool freetype SDL libX11 ]; + nativeBuildInputs = [ + pkg-config + autoconf + automake + libtool + ]; + buildInputs = [ + freetype + SDL + ] ++ lib.optionals stdenv.isLinux [ + libX11 + ]; postPatch = '' substituteInPlace include/agg_renderer_outline_aa.h \ @@ -22,7 +32,13 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" "--enable-examples=no" ]; + configureFlags = [ + (lib.strings.enableFeature stdenv.isLinux "platform") + "--enable-examples=no" + ] ++ lib.optionals stdenv.isLinux [ + "--x-includes=${lib.getDev libX11}/include" + "--x-libraries=${lib.getLib libX11}/lib" + ]; # libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o # libtool: error: cannot find the library 'libexamples.la' @@ -43,6 +59,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "http://www.antigrain.com/"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } |