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: 59241cb778a0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: de123f796f9b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 18, 2019

  1. wt: Permit overriding of optional libraries

    @arthurl
    arthurl committed Oct 18, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ejose19
    GPG key ID: 09BEDF7CC137762C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    25a0f5a View commit details

Commits on Oct 20, 2019

  1. Merge pull request #71317 from arthurl/arthur/wt-PR 

    wt: Permit overriding of optional libraries
    @WilliButz
    WilliButz authored Oct 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ejose19
    GPG key ID: 09BEDF7CC137762C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    de123f7 View commit details
Showing with 7 additions and 4 deletions.
  1. +7 −4 pkgs/development/libraries/wt/default.nix
11 changes: 7 additions & 4 deletions pkgs/development/libraries/wt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,13 +27,16 @@ let
];

cmakeFlags = [
"-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
"-DWT_CPP_11_MODE=-std=c++11"
"-DGM_PREFIX=${graphicsmagick}"
"-DMYSQL_PREFIX=${libmysqlclient}"
"-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 (libmysqlclient != null)
"-DMYSQL_PREFIX=${libmysqlclient}";

meta = with stdenv.lib; {
homepage = "https://www.webtoolkit.eu/wt";