From b19c0e84e472a74a974a636105857e81237bac7a Mon Sep 17 00:00:00 2001 From: esthromeris Date: Tue, 9 Jan 2024 15:15:18 +0100 Subject: [PATCH] igir: use autoPatchelfHook This fixes https://github.com/NixOS/nixpkgs/issues/279695 --- .../default.nix => by-name/ig/igir/package.nix} | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) rename pkgs/{tools/games/igir/default.nix => by-name/ig/igir/package.nix} (64%) diff --git a/pkgs/tools/games/igir/default.nix b/pkgs/by-name/ig/igir/package.nix similarity index 64% rename from pkgs/tools/games/igir/default.nix rename to pkgs/by-name/ig/igir/package.nix index 4f4cf048a659..80e22a5e4334 100644 --- a/pkgs/tools/games/igir/default.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -1,6 +1,11 @@ { lib , buildNpmPackage , fetchFromGitHub + +# for patching bundled 7z binary from the 7zip-bin node module +# at lib/node_modules/igir/node_modules/7zip-bin/linux/x64/7za +, autoPatchelfHook +, stdenv }: buildNpmPackage rec { @@ -21,6 +26,14 @@ buildNpmPackage rec { patchShebangs scripts/update-readme-help.sh ''; + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ stdenv.cc.cc.lib ]; + + # from lib/node_modules/igir/node_modules/@node-rs/crc32-linux-x64-musl/crc32.linux-x64-musl.node + # Irrelevant to our use + autoPatchelfIgnoreMissingDeps = [ "libc.musl-x86_64.so.1" ]; + meta = with lib; { description = "A video game ROM collection manager to help filter, sort, patch, archive, and report on collections on any OS"; homepage = "https://igir.io"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bc53c7d5d01..a9982028f404 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1909,8 +1909,6 @@ with pkgs; hyperpotamus = callPackage ../tools/misc/hyperpotamus { }; - igir = callPackage ../tools/games/igir { }; - immich-cli = callPackage ../tools/misc/immich-cli { }; inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service;