diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix index e6781ce540fa..ab0071c564cb 100644 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ b/pkgs/by-name/me/mealie/mealie-frontend.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/frontend/yarn.lock"; - hash = "sha256-e+3LCoOzfjSG4CjzOLXTcXGkmzNwFTLCrN0l5odOBMs="; + hash = "sha256-vw7OtXRrASOac4J5j6X/U2kxZa9I9thecUUl6XOYz5w="; }; nativeBuildInputs = [ @@ -28,6 +28,7 @@ stdenv.mkDerivation { nodejs (yarn.override { inherit nodejs; }) writableTmpDirAsHomeHook + dart-sass ]; configurePhase = '' @@ -37,11 +38,11 @@ stdenv.mkDerivation { yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" fixup-yarn-lock yarn.lock - yarn install --frozen-lockfile --offline --no-progress --non-interactive - patchShebangs node_modules/ + yarn install --frozen-lockfile --offline --no-progress --non-interactive --ignore-scripts + patchShebangs node_modules - mkdir -p node_modules/sass-embedded/dist/lib/src/vendor/dart-sass - ln -s ${dart-sass}/bin/dart-sass node_modules/sass-embedded/dist/lib/src/vendor/dart-sass/sass + substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ + --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];' runHook postConfigure ''; @@ -50,9 +51,7 @@ stdenv.mkDerivation { runHook preBuild export NUXT_TELEMETRY_DISABLED=1 - yarn --offline build - yarn --offline generate - + yarn --offline generate --env production runHook postBuild ''; diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 7a141243ed9c..821f833b530b 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -11,12 +11,12 @@ }: let - version = "3.2.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "mealie-recipes"; repo = "mealie"; tag = "v${version}"; - hash = "sha256-LIWubw+iO17giSvGCl5LzI429725sisp5u4Z4usJOGA="; + hash = "sha256-iaddAIsrUH6g4KXuSTIulNVWOfy/IWg0Czs9JgDxXUk="; }; frontend = callPackage (import ./mealie-frontend.nix src version) { };