From 0b29e62aa1af595290d59c9b046ee8158e4181e8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 24 Jul 2024 00:07:06 +0200 Subject: [PATCH] Revert "wayland: don't propagate bin output" This reverts commit 3f15de5959114a7b7b793b2fc9568b6605eb069d. As commented in https://github.com/NixOS/nixpkgs/pull/328804#issuecomment-2245593645, this broke quite some builds, and some of the interactions between wayland and its `.pc` file are still uncertain. Revert for now, and re-roll this later. --- pkgs/development/libraries/wayland/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 6a057a9847dd..5a78a5c993ef 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -55,9 +55,6 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "bin" "dev" ] ++ lib.optionals withDocumentation [ "doc" "man" ]; separateDebugInfo = true; - # We don't want `bin` to be propagated, as it'd propagate wayland-scanner, which breaks cross. - # See https://github.com/NixOS/nixpkgs/pull/328804 - propagatedBuildOutputs = [ "out" "dev" ]; mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}"