Skip to content

Commit

Permalink
Fix incorrect fetches of patches
Browse files Browse the repository at this point in the history
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
  • Loading branch information
danielfullmer committed Apr 16, 2024
1 parent 99ff19f commit 0739781
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pkgs/l4t/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,9 @@ let
# See https://nv-tegra.nvidia.com/tegra/v4l2-src/v4l2_libs.git
_l4t-multimedia-v4l = libv4l.overrideAttrs ({ nativeBuildInputs ? [ ], patches ? [ ], postPatch ? "", ... }: {
nativeBuildInputs = nativeBuildInputs ++ [ dpkg ];
patches = patches ++ lib.singleton (fetchpatch {
patches = patches ++ lib.singleton (fetchurl {
url = "https://raw.githubusercontent.com/OE4T/meta-tegra/85aa94e16104debdd01a3f61a521b73d86340a9f/recipes-multimedia/libv4l2/libv4l2-minimal/0003-Update-conversion-defaults-to-match-NVIDIA-sources.patch";
sha256 = "sha256-vGilgHWinrKjX+ikHo0J20PL713+w+lv46dBgfdvsZM=";
sha256 = "sha256-gzWMilEbxkQfbArkCgFSYs9A06fdciCijYYCCpEiHOc=";
});
# Use a placeholder path that we replace in the l4t-multimedia derivation, We avoid an infinite recursion problem this way.
postPatch = postPatch + ''
Expand Down
2 changes: 1 addition & 1 deletion pkgs/samples/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ let
sha256 = "sha256-IJ1teGEUxYDEPYSvYZbqdmUYg9tOORN7WGYpDaUUnHY=";
})
(fetchurl {
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";
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";
sha256 = "sha256-mkS2eKuDvXDhHkIglUGcYbEWGxCP5gRSdmEvuVw/chI=";
})
];
Expand Down

0 comments on commit 0739781

Please sign in to comment.