Unverified Commit fd538cf5 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #202914 from lilyinstarlight/fix/open-stage-control-package-lock 

open-stage-control: use postPatch for copying in package-lock.json
parents 2afac7a2 cfec4c68

pkgs/applications/audio/open-stage-control/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ buildNpmPackage rec { 
    hash = "sha256-XgwlRdwUSl4gIRKqk6BnMAKarVvp291zk8vmNkuRWKo=";

  };



  patches = [

  # Use generated package-lock.json since upstream does not provide one in releases

    ./package-lock.json.patch

  ];

  postPatch = ''

    ln -sT ${./package-lock.json} ./package-lock.json

  '';



  npmDepsHash = "sha256-5KZXZ4agHcAh3gai5w9YodETIEGJtDq/kyEZOHb9dOc=";
@@ -38,7 +38,7 @@ buildNpmPackage rec { 
    runHook preInstall



    # prune unused deps

    npm prune --omit dev $npmFlags

    npm prune --omit dev --no-save $npmFlags



    # copy built app and node_modules directories

    mkdir -p $out/lib/node_modules/open-stage-control

pkgs/applications/audio/open-stage-control/package-lock.json

0 → 100644
+18244 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/applications/audio/open-stage-control/package-lock.json.patch

deleted100644 → 0
+0 −18247

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/applications/audio/open-stage-control/update.sh

+1 −4
Original line number Diff line number Diff line
@@ -47,10 +47,7 @@ curl -sSL https://raw.githubusercontent.com/jean-emmanuel/open-stage-control/v"$ 
# Lock dependencies with npm

(cd "$pkgdir" && npm install --package-lock-only --ignore-scripts --legacy-peer-deps)



# Turn lock file into patch file

(cd "$pkgdir" && (diff -u /dev/null ./package-lock.json || [ $? -eq 1 ])) >"$pkgdir"/package-lock.json.patch



rm -f "$pkgdir"/{package.json,package-lock.json}

rm -f "$pkgdir"/package.json



# Update FOD hash

curhash="$(nixeval "$attr.npmDeps.outputHash")"