add workaround for some broken builds
This commit is contained in:
parent
16e2a5dcc5
commit
a2678a13fa
2 changed files with 48 additions and 0 deletions
47
nixpkgs/bugfix.patch
Normal file
47
nixpkgs/bugfix.patch
Normal file
|
@ -0,0 +1,47 @@
|
|||
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
|
||||
index 4091fc7dc8d8..0a3b600e18ac 100644
|
||||
--- a/pkgs/development/interpreters/ruby/default.nix
|
||||
+++ b/pkgs/development/interpreters/ruby/default.nix
|
||||
@@ -290,9 +290,6 @@ let
|
||||
'';
|
||||
doInstallCheck = true;
|
||||
|
||||
- disallowedRequisites = op (!jitSupport) stdenv.cc.cc
|
||||
- ++ op useBaseRuby baseRuby;
|
||||
-
|
||||
meta = with lib; {
|
||||
description = "An object-oriented language for quick and easy programming";
|
||||
homepage = "https://www.ruby-lang.org/";
|
||||
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
|
||||
index 845caf57caa9..b46f40a96e8c 100644
|
||||
--- a/pkgs/development/libraries/libgudev/default.nix
|
||||
+++ b/pkgs/development/libraries/libgudev/default.nix
|
||||
@@ -39,13 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
udev
|
||||
glib
|
||||
- ];
|
||||
-
|
||||
- checkInputs = [
|
||||
glibcLocales
|
||||
umockdev
|
||||
];
|
||||
-
|
||||
+
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
|
||||
index dc53bbb54d2a..5434edcd24de 100644
|
||||
--- a/pkgs/development/libraries/wayland/protocols.nix
|
||||
+++ b/pkgs/development/libraries/wayland/protocols.nix
|
||||
@@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
- nativeBuildInputs = [ meson ninja wayland-scanner ];
|
||||
- nativeCheckInputs = [ python3 wayland ];
|
||||
+ nativeBuildInputs = [ meson ninja wayland-scanner python3 wayland ];
|
||||
|
||||
mesonFlags = [ "-Dtests=${lib.boolToString doCheck}" ];
|
||||
|
|
@ -8,5 +8,6 @@ applyPatches {
|
|||
patches = [
|
||||
./nixpkgs.patch
|
||||
./245332.patch
|
||||
./bugfix.patch
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue