ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 12:39:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #308448 from r-ryantm/auto-update/corrosion

Browse Source 
corrosion: 0.4.8 -> 0.5
This commit is contained in:
Sandro 2024-06-09 16:01:14 +02:00 committed by GitHub
commit d2768ea8ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/kde/angelfish.nix
View File

@ -4,6 +4,7 @@
, cmake
, corrosion
, extra-cmake-modules
, fetchpatch2
, futuresql
, kconfig
, kcoreaddons
@ -30,6 +31,14 @@
mkDerivation rec {
pname = "angelfish";
patches = [
(fetchpatch2 {
name = "fix-build-with-corrosion-0.5.patch";
url = "https://invent.kde.org/network/angelfish/-/commit/b04928e3b62a11b647622b81fb67b7c0db656ac8.patch";
hash = "sha256-9rpkMKQKrvGJFIQDwSIeeZyk4/vd348r660mBOKzM2E=";
})
];
cargoDeps = rustPlatform.fetchCargoTarball {
# include version in the name so we invalidate the FOD
name = "${pname}-${srcs.angelfish.version}";

4
pkgs/development/tools/build-managers/corrosion/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "corrosion";
version = "0.4.8";
version = "0.5";
src = fetchFromGitHub {
owner = "corrosion-rs";
repo = "corrosion";
rev = "v${version}";
hash = "sha256-ChoeN7qQRR1YmYYvPdJVJ2SVGTDGlM7PsN9jzFjQEyU=";
hash = "sha256-vaNXXXaGqYNmhonU+ANN857LAUgwv+PMcON+nBuUoeo=";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;