diff options
| author | Kiskae <Kiskae@users.noreply.github.com> | 2023-05-13 20:16:00 +0200 |
|---|---|---|
| committer | Kiskae <Kiskae@users.noreply.github.com> | 2023-05-13 20:16:00 +0200 |
| commit | 89f389dd941b4d85c10651f1b5f1c5f5db97f173 (patch) | |
| tree | 1d9ea616fcf3399cc8489f9b0e404b13e5ea8f16 | |
| parent | 0b14e79f1ca4b1722d222d8a089f5ee961be1a91 (diff) | |
| download | nixpkgs-89f389dd941b4d85c10651f1b5f1c5f5db97f173.tar nixpkgs-89f389dd941b4d85c10651f1b5f1c5f5db97f173.tar.gz nixpkgs-89f389dd941b4d85c10651f1b5f1c5f5db97f173.tar.bz2 nixpkgs-89f389dd941b4d85c10651f1b5f1c5f5db97f173.tar.lz nixpkgs-89f389dd941b4d85c10651f1b5f1c5f5db97f173.tar.xz nixpkgs-89f389dd941b4d85c10651f1b5f1c5f5db97f173.tar.zst nixpkgs-89f389dd941b4d85c10651f1b5f1c5f5db97f173.zip | |
nvidia_x11: replace pre/postPatch with patchFlags
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index cac969817e9..843d58a6447 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -43,9 +43,7 @@ rec { settingsSha256 = "sha256-8KB6T9f+gWl8Ni+uOyrJKiiH5mNx9eyfCcW/RjPTQQA="; persistencedSha256 = "sha256-zrstlt/0YVGnsPGUuBbR9ULutywi2wNDVxh7OhJM7tM="; - prePatch = "pushd kernel"; - postPatch = "popd"; - + patchFlags = [ "-p1" "-d" "kernel" ]; patches = [ # source: https://gist.github.com/joanbm/77f0650d45747b9a4dc8e330ade2bf5c (fetchpatch { @@ -89,9 +87,7 @@ rec { settingsSha256 = "sha256-TRKQ4brLnCbBZt1smGSIHTfwW+wEFPWWPEwDxjVXN7s="; persistencedSha256 = "sha256-fSJMx49z9trdNxx0iPI45oG57smvvhaqVNxsRnfXKCI="; - prePatch = "pushd kernel"; - postPatch = "popd"; - + patchFlags = [ "-p1" "-d" "kernel" ]; patches = [ # source: https://gist.github.com/joanbm/d10e9cbbbb8e245b6e7e27b2db338faf (fetchpatch { diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 3f87974b776..6455010d988 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -16,6 +16,7 @@ , prePatch ? "" , postPatch ? null +, patchFlags ? null , patches ? [] , broken ? false , brokenOpen ? broken @@ -85,7 +86,7 @@ let else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}"; patches = if libsOnly then null else patches; - inherit prePatch postPatch; + inherit prePatch postPatch patchFlags; inherit version useGLVND useProfiles; inherit (stdenv.hostPlatform) system; inherit i686bundled; |