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

Commits on Oct 28, 2019

  1. vte: enable building with musl 

    VTE requires a small patch to be able to be built with musl.
    @cdepillabout @nh2
    cdepillabout authored and nh2 committed Oct 28, 2019
    Copy the full SHA
    fc265d9 View commit details

  2. Merge pull request #71577 from cdepillabout/vte-compiling-with-musl 

    vte: enable compiling with musl
    @nh2
    nh2 authored Oct 28, 2019
    Copy the full SHA
    aaddb5f View commit details
Showing with 13 additions and 0 deletions.
  1. +13 −0 pkgs/development/libraries/vte/default.nix
13 changes: 13 additions & 0 deletions pkgs/development/libraries/vte/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, gettext
, pkgconfig
, meson
@@ -58,6 +60,17 @@ stdenv.mkDerivation rec {
pango
];

patches =
# VTE needs a small patch to work with musl:
# https://gitlab.gnome.org/GNOME/vte/issues/72
lib.optional
stdenv.hostPlatform.isMusl
(fetchpatch {
name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch";
url = "https://gitlab.gnome.org/GNOME/vte/uploads/c334f767f5d605e0f30ecaa2a0e4d226/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch";
sha256 = "1ii9db9i5l3fy2alxz7bjfsgjs3lappnlx339dvxbi2141zknf5r";
});

postPatch = ''
patchShebangs perf/*
patchShebangs src/box_drawing_generate.sh