diff --git a/packages/grimmory/package.nix b/packages/grimmory/package.nix --- a/packages/grimmory/package.nix +++ b/packages/grimmory/package.nix @@ -29,6 +29,9 @@ pname = "grimmory-frontend"; inherit version src; sourceRoot = "${src.name}/frontend"; + patches = [ + ./yarn-4.14.patch + ]; nativeBuildInputs = [ nodejs @@ -40,8 +43,13 @@ env.CI = true; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src sourceRoot missingHashes; - hash = "sha256-V5+mezZsbiytv01PGTbEKB4iYhlPtJ2IkAtsBz1ZTAw="; + inherit (finalAttrs) + src + sourceRoot + missingHashes + patches + ; + hash = "sha256-AAy5d9QnZWqCI9IPBMTEMNPRRef5gBYbBAAOsoMl7RI="; }; buildPhase = '' @@ -108,13 +116,15 @@ cp -r ${frontend}/dist/* src/main/resources/static/ chmod -R u+w src/main/resources/static ''; + env.APP_VERSION = finalAttrs.version; + gradleBuildTask = "build -x test"; doCheck = false; installPhase = '' mkdir -p $out/{bin,share/grimmory} - cp build/libs/backend-0.0.1-SNAPSHOT.jar $out/share/grimmory/grimmory.jar + cp build/libs/backend-${finalAttrs.version}.jar $out/share/grimmory/grimmory.jar makeWrapper ${jdk25}/bin/java $out/bin/grimmory \ --add-flags "-classpath ${jna}/share/java" \ --add-flags "-Djava.library.path=${lib.getLib libarchive}/lib" \ diff --git a/packages/grimmory/yarn-4.14.patch b/packages/grimmory/yarn-4.14.patch new file mode 100644 --- /dev/null +++ b/packages/grimmory/yarn-4.14.patch @@ -0,0 +1,24 @@ +diff --git c/frontend/.yarnrc.yml i/frontend/.yarnrc.yml +index 0bcaae0b..13bb5f61 100644 +--- c/.yarnrc.yml ++++ i/.yarnrc.yml +@@ -3,3 +3,6 @@ nmMode: hardlinks-local + enableGlobalCache: false + cacheFolder: .yarn/cache + npmMinimalAgeGate: 4320 ++enableScripts: true ++approvedGitRepositories: ++ - "**" +diff --git c/frontend/yarn.lock i/frontend/yarn.lock +index 34062b1f..5ef35ade 100644 +--- c/yarn.lock ++++ i/yarn.lock +@@ -2,7 +2,7 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10c0 + + "@adobe/css-tools@npm:^4.4.0":