diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-20 14:55:32 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-20 14:55:32 +0100 |
| commit | 34b58aaefccdb5c64b912903973ba729bae58be3 (patch) | |
| tree | e18a96bc0f066422356a8da655453403baa97e64 /nixpkgs/pkgs/os-specific | |
| parent | 7be318098d7fe87d896e8787bfadc0345149cb59 (diff) | |
| parent | 3fb937a1e9f4157f57011965b99fcb7f4139d9ad (diff) | |
| download | nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.gz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.bz2 nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.lz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.xz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.zst nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/os-specific')
| -rw-r--r-- | nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix | 11 | ||||
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix | 8 |
2 files changed, 18 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix index 5cf92a41a6f8..d9a2b378134a 100644 --- a/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv }: +{ lib, fetchFromGitHub, fetchpatch, stdenv }: stdenv.mkDerivation { pname = "core-symbolication"; @@ -11,6 +11,15 @@ stdenv.mkDerivation { hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE="; }; + patches = [ + # C99 compilation fix + # https://github.com/matthewbauer/CoreSymbolication/pull/1 + (fetchpatch { + url = "https://github.com/boltzmannrain/CoreSymbolication/commit/1c26cc93f260bda9230a93e91585284e80aa231f.patch"; + hash = "sha256-d/ieDEnvZ9kVOjBVUdJzGmdvC1AF3Jk4fbwp04Q6l/I="; + }) + ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix index a6795c3fd5e7..0625985c908f 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , kernel , nvidia_x11 , hash @@ -18,6 +19,13 @@ stdenv.mkDerivation ({ inherit hash; }; + patches = lib.optionals (nvidia_x11.version == "545.29.02")[ + (fetchpatch { + url = "https://github.com/NVIDIA/open-gpu-kernel-modules/files/13310810/0001-nvkms-initialize-brightnessType-in-_BACKLIGHT_BRIGHT.patch.txt"; + hash = "sha256-9N+DbyT4VmGNTHXWf23PJU4YWZS+0JK7yqkmkpnINPk="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernel.makeFlags ++ [ |