Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9db9719ea2bf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 48a22a0ff7d7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 25, 2019

  1. wt: Allow optional library harfbuzz to be overriden with null

    @arthurl
    arthurl committed Oct 25, 2019
    Copy the full SHA
    d2282cc View commit details

  2. Merge pull request #71964 from arthurl/wt-PR 

    wt: Allow optional library harfbuzz to be overriden with null
    @globin
    globin authored Oct 25, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    48a22a0 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/libraries/wt/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/libraries/wt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,13 +28,14 @@ let

cmakeFlags = [
"-DWT_CPP_11_MODE=-std=c++11"
"-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
"--no-warn-unused-cli"
]
++ stdenv.lib.optionals (graphicsmagick != null) [
"-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
"-DGM_PREFIX=${graphicsmagick}"
]
++ stdenv.lib.optional (harfbuzz != null)
"-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
++ stdenv.lib.optional (libmysqlclient != null)
"-DMYSQL_PREFIX=${libmysqlclient}";