diff --git a/pkgs/by-name/de/deltachat-tauri/package.nix b/pkgs/by-name/de/deltachat-tauri/package.nix index 039750226993..1b16a2a003ba 100644 --- a/pkgs/by-name/de/deltachat-tauri/package.nix +++ b/pkgs/by-name/de/deltachat-tauri/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-JhsoIQZrU4GVcs/TCIug6y/84gODyEWl0Bl2jRNxL5Y="; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace $cargoDepsCopy/source-registry-0/libappindicator-sys-*/src/lib.rs \ + substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \ --replace-fail libayatana-appindicator3.so.1 '${libayatana-appindicator}/lib/libayatana-appindicator3.so.1' ''; diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix index 0355a9f15e26..a0f6c7f6e0e3 100644 --- a/pkgs/by-name/go/gossip/package.nix +++ b/pkgs/by-name/go/gossip/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-rE7SErOhl2fcmvLairq+mvdnbDIk1aPo3eYqwRx5kkA="; postPatch = '' - substituteInPlace $cargoDepsCopy/source-registry-0/sdl2-sys-0.37.0/SDL/CMakeLists.txt \ + substituteInPlace $cargoDepsCopy/*/sdl2-sys-0.37.0/SDL/CMakeLists.txt \ --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.0.0...3.5)" \ --replace-fail "cmake_minimum_required(VERSION 3.4)" "cmake_minimum_required(VERSION 3.4...3.5)" ''; diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix index 4ac67b07ecc7..0bd8e67d767c 100644 --- a/pkgs/by-name/ha/handy/package.nix +++ b/pkgs/by-name/ha/handy/package.nix @@ -92,7 +92,7 @@ rustPlatform.buildRustPackage (finalAttrs: { -exec sed -i -e '/cbindgen::Builder::new/{:l;/write_to_file/!{N;bl};d}' {} + '' + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace "$cargoDepsCopy"/source-registry-0/libappindicator-sys-*/src/lib.rs \ + substituteInPlace "$cargoDepsCopy"/*/libappindicator-sys-*/src/lib.rs \ --replace-fail 'libayatana-appindicator3.so.1' '${libayatana-appindicator}/lib/libayatana-appindicator3.so.1' ''; diff --git a/pkgs/by-name/mu/murmure/package.nix b/pkgs/by-name/mu/murmure/package.nix index f45f9f8ea825..900e2d806e2a 100644 --- a/pkgs/by-name/mu/murmure/package.nix +++ b/pkgs/by-name/mu/murmure/package.nix @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # The libappindicator_sys crate loads these libraries at runtime postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace $cargoDepsCopy/source-registry-0/libappindicator-sys-*/src/lib.rs \ + substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \ --replace-fail \ "libayatana-appindicator3.so.1" \ "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" \ diff --git a/pkgs/by-name/oc/oculante/libaom-sys-0.17.2+libaom.3.11.0-cmake-nasm-fix.patch b/pkgs/by-name/oc/oculante/libaom-sys-0.17.2+libaom.3.11.0-cmake-nasm-fix.patch index 744d0a05da55..01d78bed306f 100644 --- a/pkgs/by-name/oc/oculante/libaom-sys-0.17.2+libaom.3.11.0-cmake-nasm-fix.patch +++ b/pkgs/by-name/oc/oculante/libaom-sys-0.17.2+libaom.3.11.0-cmake-nasm-fix.patch @@ -1,5 +1,5 @@ ---- a/libaom-sys-0.17.2+libaom.3.11.0/vendor/build/cmake/aom_optimization.cmake -+++ b/libaom-sys-0.17.2+libaom.3.11.0/vendor/build/cmake/aom_optimization.cmake +--- a/vendor/build/cmake/aom_optimization.cmake ++++ b/vendor/build/cmake/aom_optimization.cmake @@ -212,7 +212,7 @@ endfunction() # Currently checks only for presence of required object formats and support for # the -Ox argument (multipass optimization). diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index c834df0ca4bd..f1c0f2df5c3f 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -67,17 +67,11 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=thumbnails::test_thumbs" # broken as of v0.9.2 ]; - patches = [ - # The below patch is needed to fix this build, until the upstream dependency (libavif-rs) fixes the problem. - # The explicit `patchFlags` can also be removed when this patch becomes obsolete. - # - ./libaom-sys-0.17.2+libaom.3.11.0-cmake-nasm-fix.patch - ]; - - patchFlags = [ - "-p1" - "--directory=../${finalAttrs.pname}-${finalAttrs.version}-vendor/source-registry-0" - ]; + # The below patch is needed to fix this build, until the upstream dependency (libavif-rs) fixes the problem. + # + postPatch = '' + patch -p1 -d "$cargoDepsCopy"/*/libaom-sys-0.17.2+libaom.3.11.0 -i ${./libaom-sys-0.17.2+libaom.3.11.0-cmake-nasm-fix.patch} + ''; postInstall = '' install -Dm444 $src/res/icons/icon.png $out/share/icons/hicolor/128x128/apps/oculante.png