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

Commits on Mar 11, 2019

  1. sway-beta: Use the upstream patch to fix the build failure

    @primeos
    primeos committed Mar 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    GPG key ID: B3F5D81B0C6967C4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1240834 View commit details
Showing with 8 additions and 11 deletions.
  1. +8 −11 pkgs/applications/window-managers/sway/beta.nix
19 changes: 8 additions & 11 deletions pkgs/applications/window-managers/sway/beta.nix
View file
Original file line number Diff line number Diff line change
@@ -19,17 +19,14 @@ stdenv.mkDerivation rec {
sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx";
};

# TODO: The following patch introduced a compiler warning which leads to a
# build failure (we'll revert it for now as this patch is not supposed to
# change any functionality):
patch-remove-unused-functions = fetchpatch {
url = "https://github.com/swaywm/sway/commit/2b70e8518b7327d29eec4f9593e9b8f4238cebfe.patch";
sha256 = "1bq1i8dzxwckahzna6s9swvhpj1c1ics14pc1f1jcxwya50lk1rz";
};

postPatch = ''
patch -p1 --reverse < ${patch-remove-unused-functions}
'';
patches = [
# Fix for a compiler warning that causes a build failure
# (see https://github.com/swaywm/sway/issues/3862):
(fetchpatch {
url = "https://github.com/swaywm/sway/commit/bcde298a719f60b9913133dbd2a169dedbc8dd7d.patch";
sha256 = "0r583nmqvq43ib93yv6flw8pj833v32lbs0q0xld56s3rnzvvdcp";
})
];

nativeBuildInputs = [
pkgconfig meson ninja