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

Commits on Jan 8, 2018

  1. readline: Don't attempt to check for broken wcwidth 

    The test requires running code on the target.
    @bgamari @Ericson2314
    bgamari authored and Ericson2314 committed Jan 8, 2018
    Copy the full SHA
    dc8bd43 View commit details

  2. Merge pull request #33576 from dtzWill/fix/cross-readline 

    readline: Don't attempt to check for broken wcwidth
    @Ericson2314
    Ericson2314 authored Jan 8, 2018
    Copy the full SHA
    0fb7245 View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/development/libraries/readline/6.3.nix
6 changes: 6 additions & 0 deletions pkgs/development/libraries/readline/6.3.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,12 @@ stdenv.mkDerivation rec {

patchFlags = "-p0";

configureFlags =
stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
[ # This test requires running host code
"bash_cv_wcwidth_broken=no"
];

patches =
[ ./link-against-ncurses.patch
./no-arch_only-6.3.patch