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: 576af1718704
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d2948870518
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 5, 2019

  1. sword: fixup build with icu >= 61 

    /cc #60250 (2fe63c8).
    @vcunat
    vcunat committed Jun 5, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    turboMaCk Marek Fajkus
    GPG key ID: 95585219BA6FE2CC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0d29488 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/development/libraries/sword/default.nix
7 changes: 6 additions & 1 deletion pkgs/development/libraries/sword/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,12 @@ stdenv.mkDerivation rec {
})
];

configureFlags = [ "--without-conf" "--enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable" ];
configureFlags = [ "--without-conf" "--enable-tests=no" ];
CXXFLAGS = [
"-Wno-unused-but-set-variable"
# compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
"-DU_USING_ICU_NAMESPACE=1"
];

meta = with stdenv.lib; {
description = "A software framework that allows research manipulation of Biblical texts";