BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #292767 from wegank/7zz-unpack-cleanup

Browse source 
treewide: remove unpackCmd involving 7zz
This commit is contained in:
Weijia Wang 2024-03-02 19:13:44 +01:00 committed by GitHub
commit f5c6f98bde
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 6 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/misc/monitorcontrol/default.nix
View file

@ -14,14 +14,6 @@ stdenv.mkDerivation rec {
};
# MonitorControl.${version}.dmg is APFS formatted, unpack with 7zz
unpackCmd = ''
runHook preUnpack
7zz x $src
runHook postUnpack
'';
nativeBuildInputs = [ _7zz ];
sourceRoot = "MonitorControl.app";

12
pkgs/by-name/no/nosql-workbench/package.nix
View file

@ -39,20 +39,12 @@ if stdenv.isDarwin then stdenv.mkDerivation {
sourceRoot = ".";
nativeBuildInputs = [ _7zz ];
buildInputs = [ jdk21 ];
# DMG file is using APFS which is unsupported by "undmg".
# Instead, use "7zz" to extract the contents.
# "undmg" issue: https://github.com/matthewbauer/undmg/issues/4
unpackCmd = ''
runHook preUnpack
nativeBuildInputs = [ _7zz ];
7zz x $curSrc
runHook postUnpack
'';
buildInputs = [ jdk21 ];
installPhase = ''
runHook preInstall

4
pkgs/development/libraries/science/math/mkl/default.nix
View file

@ -68,9 +68,7 @@ in stdenvNoCC.mkDerivation ({
dontUnpack = stdenvNoCC.isLinux;
unpackPhase = if stdenvNoCC.isDarwin then ''
7zz x $src
'' else null;
sourceRoot = if stdenvNoCC.isDarwin then "." else null;
nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin
then

10
pkgs/os-specific/darwin/airbuddy/default.nix
View file

@ -19,16 +19,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
dontBuild = true;
dontFixup = true;
nativeBuildInputs = [ _7zz ];
# AirBuddy.dmg is APFS formatted, unpack with 7zz
unpackCmd = ''
runHook preUnpack
7zz x $src
runHook postUnpack
'';
nativeBuildInputs = [ _7zz ];
sourceRoot = "AirBuddy.app";

10
pkgs/os-specific/darwin/aldente/default.nix
View file

@ -16,16 +16,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
dontBuild = true;
dontFixup = true;
nativeBuildInputs = [ _7zz ];
# AlDente.dmg is APFS formatted, unpack with 7zz
unpackCmd = ''
runHook preUnpack
7zz x $src
runHook postUnpack
'';
nativeBuildInputs = [ _7zz ];
sourceRoot = "AlDente.app";

1
pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix
View file

@ -15,7 +15,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# APFS format is unsupported by undmg
nativeBuildInputs = [ _7zz ];
unpackCmd = "7zz x $curSrc";
installPhase = ''
runHook preInstall

4
pkgs/tools/misc/archi/default.nix
View file

@ -42,9 +42,7 @@ stdenv.mkDerivation rec {
autoPatchelfHook
];
unpackPhase = if stdenv.hostPlatform.isDarwin then ''
7zz x $src
'' else null;
sourceRoot = if stdenv.isDarwin then "." else null;
installPhase =
if stdenv.hostPlatform.system == "x86_64-linux" then