diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-02 12:03:56 +0100 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-02 12:11:34 +0100 |
commit | 7d15e810d7600d9b7a1ad269174eb444482e1309 (patch) | |
tree | cacbba704ce935ceaafc0e3ff1ba4514f1f88ced | |
parent | f514e5c53d47636e4d0e3af9f76a5d45b8410e03 (diff) |
treewide: remove unpackCmd involving 7zz
-rw-r--r-- | pkgs/applications/misc/monitorcontrol/default.nix | 8 | ||||
-rw-r--r-- | pkgs/by-name/no/nosql-workbench/package.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/mkl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/airbuddy/default.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/aldente/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/misc/archi/default.nix | 4 |
7 files changed, 6 insertions, 43 deletions
diff --git a/pkgs/applications/misc/monitorcontrol/default.nix b/pkgs/applications/misc/monitorcontrol/default.nix index 6c3a1ccec34e7..b5a6935958e23 100644 --- a/pkgs/applications/misc/monitorcontrol/default.nix +++ b/pkgs/applications/misc/monitorcontrol/default.nix @@ -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"; diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix index 9fb744fa6570f..1b96328b211b4 100644 --- a/pkgs/by-name/no/nosql-workbench/package.nix +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -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 - - 7zz x $curSrc + nativeBuildInputs = [ _7zz ]; - runHook postUnpack - ''; + buildInputs = [ jdk21 ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index f4b168b37fe2d..90e6c05da77d0 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -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 diff --git a/pkgs/os-specific/darwin/airbuddy/default.nix b/pkgs/os-specific/darwin/airbuddy/default.nix index 374089c5aa1ff..19c1ada4408a7 100644 --- a/pkgs/os-specific/darwin/airbuddy/default.nix +++ b/pkgs/os-specific/darwin/airbuddy/default.nix @@ -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"; diff --git a/pkgs/os-specific/darwin/aldente/default.nix b/pkgs/os-specific/darwin/aldente/default.nix index e585d8877803d..dd81cbece3357 100644 --- a/pkgs/os-specific/darwin/aldente/default.nix +++ b/pkgs/os-specific/darwin/aldente/default.nix @@ -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"; diff --git a/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix b/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix index b28b7ad784f8d..6337b0d7f4f51 100644 --- a/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix +++ b/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix @@ -15,7 +15,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { # APFS format is unsupported by undmg nativeBuildInputs = [ _7zz ]; - unpackCmd = "7zz x $curSrc"; installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index e5850f8871e7b..23c5372e5eef6 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -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 |