diff --git a/pkgs/by-name/as/asar/package.json b/pkgs/by-name/as/asar/package.json deleted file mode 100644 index 51ed0e24ffeb..000000000000 --- a/pkgs/by-name/as/asar/package.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "name": "@electron/asar", - "description": "Creating Electron app packages", - "version": "0.0.0-development", - "main": "./lib/asar.js", - "types": "./lib/index.d.ts", - "bin": { - "asar": "./bin/asar.js" - }, - "files": [ - "bin", - "lib", - "lib/index.d.ts" - ], - "engines": { - "node": ">=10.12.0" - }, - "license": "MIT", - "homepage": "https://github.com/electron/asar", - "repository": { - "type": "git", - "url": "https://github.com/electron/asar.git" - }, - "bugs": { - "url": "https://github.com/electron/asar/issues" - }, - "scripts": { - "mocha": "xvfb-maybe electron-mocha --reporter spec && mocha --reporter spec", - "test": "npm run lint && npm run mocha", - "lint": "tsd && standard", - "standard": "standard", - "tsd": "tsd" - }, - "standard": { - "env": { - "mocha": true - }, - "globals": [ - "BigInt" - ] - }, - "tsd": { - "directory": "test" - }, - "dependencies": { - "chromium-pickle-js": "^0.2.0", - "commander": "^5.0.0", - "glob": "^7.1.6", - "minimatch": "^3.0.4" - }, - "devDependencies": { - "@continuous-auth/semantic-release-npm": "^3.0.0", - "electron": "^22.0.0", - "electron-mocha": "^11.0.2", - "lodash": "^4.17.15", - "mocha": "^10.1.0", - "rimraf": "^3.0.2", - "standard": "^14.3.3", - "tsd": "^0.25.0", - "xvfb-maybe": "^0.2.1" - } -} diff --git a/pkgs/by-name/as/asar/package.nix b/pkgs/by-name/as/asar/package.nix index 4cedace23d13..54b847819864 100644 --- a/pkgs/by-name/as/asar/package.nix +++ b/pkgs/by-name/as/asar/package.nix @@ -1,43 +1,34 @@ { lib, - mkYarnPackage, + stdenv, fetchFromGitHub, fetchYarnDeps, + yarnConfigHook, + yarnInstallHook, + nodejs, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "asar"; version = "3.2.4"; src = fetchFromGitHub { owner = "electron"; repo = "asar"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-12FP8VRDo1PQ+tiN4zhzkcfAx9zFs/0MU03t/vFo074="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-/fV3hd98pl46+fgmiMH9sDQrrZgdLY1oF9c3TaIxRSg="; }; - doDist = false; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/lib/node_modules" - mv deps/@electron "$out/lib/node_modules" - rm "$out/lib/node_modules/@electron/asar/node_modules" - mv node_modules "$out/lib/node_modules/@electron/asar" - - mkdir "$out/bin" - ln -s "$out/lib/node_modules/@electron/asar/bin/asar.js" "$out/bin/asar" - - runHook postInstall - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnInstallHook + nodejs + ]; meta = { description = "Simple extensive tar-like archive format with indexing"; @@ -46,4 +37,4 @@ mkYarnPackage rec { mainProgram = "asar"; maintainers = with lib.maintainers; [ xvapx ]; }; -} +})