lol

treewide: remove unpackCmd involving 7zz

+6 -43
-8
pkgs/applications/misc/monitorcontrol/default.nix
··· 14 14 }; 15 15 16 16 # MonitorControl.${version}.dmg is APFS formatted, unpack with 7zz 17 - unpackCmd = '' 18 - runHook preUnpack 19 - 20 - 7zz x $src 21 - 22 - runHook postUnpack 23 - ''; 24 - 25 17 nativeBuildInputs = [ _7zz ]; 26 18 27 19 sourceRoot = "MonitorControl.app";
+2 -10
pkgs/by-name/no/nosql-workbench/package.nix
··· 39 39 40 40 sourceRoot = "."; 41 41 42 - nativeBuildInputs = [ _7zz ]; 43 - 44 - buildInputs = [ jdk21 ]; 45 - 46 42 # DMG file is using APFS which is unsupported by "undmg". 47 43 # Instead, use "7zz" to extract the contents. 48 44 # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4 49 - unpackCmd = '' 50 - runHook preUnpack 51 - 52 - 7zz x $curSrc 45 + nativeBuildInputs = [ _7zz ]; 53 46 54 - runHook postUnpack 55 - ''; 47 + buildInputs = [ jdk21 ]; 56 48 57 49 installPhase = '' 58 50 runHook preInstall
+1 -3
pkgs/development/libraries/science/math/mkl/default.nix
··· 68 68 69 69 dontUnpack = stdenvNoCC.isLinux; 70 70 71 - unpackPhase = if stdenvNoCC.isDarwin then '' 72 - 7zz x $src 73 - '' else null; 71 + sourceRoot = if stdenvNoCC.isDarwin then "." else null; 74 72 75 73 nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin 76 74 then
+1 -9
pkgs/os-specific/darwin/airbuddy/default.nix
··· 19 19 dontBuild = true; 20 20 dontFixup = true; 21 21 22 - nativeBuildInputs = [ _7zz ]; 23 - 24 22 # AirBuddy.dmg is APFS formatted, unpack with 7zz 25 - unpackCmd = '' 26 - runHook preUnpack 27 - 28 - 7zz x $src 29 - 30 - runHook postUnpack 31 - ''; 23 + nativeBuildInputs = [ _7zz ]; 32 24 33 25 sourceRoot = "AirBuddy.app"; 34 26
+1 -9
pkgs/os-specific/darwin/aldente/default.nix
··· 16 16 dontBuild = true; 17 17 dontFixup = true; 18 18 19 - nativeBuildInputs = [ _7zz ]; 20 - 21 19 # AlDente.dmg is APFS formatted, unpack with 7zz 22 - unpackCmd = '' 23 - runHook preUnpack 24 - 25 - 7zz x $src 26 - 27 - runHook postUnpack 28 - ''; 20 + nativeBuildInputs = [ _7zz ]; 29 21 30 22 sourceRoot = "AlDente.app"; 31 23
-1
pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix
··· 15 15 16 16 # APFS format is unsupported by undmg 17 17 nativeBuildInputs = [ _7zz ]; 18 - unpackCmd = "7zz x $curSrc"; 19 18 20 19 installPhase = '' 21 20 runHook preInstall
+1 -3
pkgs/tools/misc/archi/default.nix
··· 42 42 autoPatchelfHook 43 43 ]; 44 44 45 - unpackPhase = if stdenv.hostPlatform.isDarwin then '' 46 - 7zz x $src 47 - '' else null; 45 + sourceRoot = if stdenv.isDarwin then "." else null; 48 46 49 47 installPhase = 50 48 if stdenv.hostPlatform.system == "x86_64-linux" then