colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

fractal: re-enable jpeg decoding

Browse Source
This commit is contained in:
Colin 2024-05-14 20:56:37 +00:00
parent 47ced34c84
commit 1210696e3a
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/additional/fractal-nixified/default.nix
View File

@ -333,16 +333,10 @@ let
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtksourceview5 ];
};
# # tried, but can't get zune-jpeg to cross compile
# zune-jpeg = attrs: attrs // {
# postPatch = ''
# # substituteInPlace src/unsafe_utils_neon.rs --replace-fail \
# # 'std::' 'core::'
# substituteInPlace src/unsafe_utils_neon.rs --replace-fail \
# '#![cfg(target_arch = "aarch64")]' \
# '#![cfg(all(feature = "neon", target_arch = "aarch64"))]'
# '';
# };
zune-jpeg = attrs: attrs // {
# it wants `type = [ "cdylib" "rlib" ]` but that causes a link format failure on cross compilation
type = [ "rlib" ];
};
};
defaultCrateOverrides' = defaultCrateOverrides // (lib.mapAttrs (crate: fn:
@ -382,23 +376,6 @@ let
}
];
};
image = crates.image // {
# zune-jpeg does not cross compile OOTB ("symbols in wrong format" when linking).
# disable jpeg feature to bypass that (does this mean i won't be able to view jpegs?)
features = crates.image.features // {
"default-formats" = lib.remove "jpeg" crates.image.features."default-formats";
};
resolvedDefaultFeatures = lib.remove "jpeg" crates.image.resolvedDefaultFeatures;
};
# zune-core = crates.zune-core // {
# resolvedDefaultFeatures = [ ];
# };
# zune-jpeg = crates.zune-jpeg // {
# features = crates.zune-jpeg.features // {
# "default" = [ "std" ];
# };
# resolvedDefaultFeatures = [ "default" "std" ];
# };
};
cargoNix = import ./Cargo.nix {