Skip to content

Commit 6cd5ae8

Browse files
committed
Fix incorrect fetches of patches
No need to use fetchpatch for non-generated patches from a specific revision of another git repo. Also, replace use of "master" with a pinned commit for another patch
1 parent 99ff19f commit 6cd5ae8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pkgs/l4t/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ let
231231
# See https://nv-tegra.nvidia.com/tegra/v4l2-src/v4l2_libs.git
232232
_l4t-multimedia-v4l = libv4l.overrideAttrs ({ nativeBuildInputs ? [ ], patches ? [ ], postPatch ? "", ... }: {
233233
nativeBuildInputs = nativeBuildInputs ++ [ dpkg ];
234-
patches = patches ++ lib.singleton (fetchpatch {
234+
patches = patches ++ lib.singleton (fetchurl {
235235
url = "https://raw.githubusercontent.com/OE4T/meta-tegra/85aa94e16104debdd01a3f61a521b73d86340a9f/recipes-multimedia/libv4l2/libv4l2-minimal/0003-Update-conversion-defaults-to-match-NVIDIA-sources.patch";
236-
sha256 = "sha256-vGilgHWinrKjX+ikHo0J20PL713+w+lv46dBgfdvsZM=";
236+
sha256 = "sha256-gzWMilEbxkQfbArkCgFSYs9A06fdciCijYYCCpEiHOc=";
237237
});
238238
# Use a placeholder path that we replace in the l4t-multimedia derivation, We avoid an infinite recursion problem this way.
239239
postPatch = postPatch + ''

pkgs/samples/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ let
245245
sha256 = "sha256-IJ1teGEUxYDEPYSvYZbqdmUYg9tOORN7WGYpDaUUnHY=";
246246
})
247247
(fetchurl {
248-
url = "https://raw.githubusercontent.com/OE4T/meta-tegra/master/recipes-multimedia/argus/tegra-mmapi-samples/0004-samples-classes-fix-a-data-race-in-shutting-down-deq.patch";
248+
url = "https://raw.githubusercontent.com/OE4T/meta-tegra/4f825ddeb2e9a1b5fbff623955123c20b82c8274/recipes-multimedia/argus/tegra-mmapi-samples/0004-samples-classes-fix-a-data-race-in-shutting-down-deq.patch";
249249
sha256 = "sha256-mkS2eKuDvXDhHkIglUGcYbEWGxCP5gRSdmEvuVw/chI=";
250250
})
251251
];

0 commit comments

Comments
 (0)