diff --git a/.config/nix/lib/darwin/mkApp.nix b/.config/nix/lib/darwin/mkApp.nix index 57f9f0a..220124d 100644 --- a/.config/nix/lib/darwin/mkApp.nix +++ b/.config/nix/lib/darwin/mkApp.nix @@ -1,5 +1,12 @@ # REF: https://github.com/bandithedoge/nixpkgs-firefox-darwin/blob/ceaca2359e5371ccef3f92a36baf7c438b354afb/overlay.nix -{ stdenv, undmg, pname, version, sourceRoot ? ".", appFileName, src, meta, nativeBuildInputs ? [ undmg ] }: +{ stdenv, undmg, _7zz, pname, version, sourceRoot ? ".", appFileName, src, meta +, nativeBuildInputs ? [ undmg _7zz ] +, unpackPhase ? "undmg $src || 7zz x -snld $src" +, installPhase ? '' + mkdir -p $out/Applications + cp -R ${appFileName} "$out/Applications/" +'' +}: stdenv.mkDerivation rec { inherit pname version; @@ -9,10 +16,7 @@ stdenv.mkDerivation rec { inherit sourceRoot; phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' - mkdir -p $out/Applications - cp -R ${appFileName} "$out/Applications/" - ''; + inherit unpackPhase installPhase; inherit meta; } diff --git a/.config/nix/overlays/darwin/heliport.nix b/.config/nix/overlays/darwin/heliport.nix index 2e6feda..03fe5c0 100644 --- a/.config/nix/overlays/darwin/heliport.nix +++ b/.config/nix/overlays/darwin/heliport.nix @@ -6,7 +6,7 @@ let version = "1.5.0"; in { heliport = mkApp { - inherit (final) stdenv undmg; + inherit (final) stdenv undmg _7zz; pname = "HeliPort"; appFileName = "HeliPort.app"; diff --git a/.config/nix/overlays/darwin/vesktop.nix b/.config/nix/overlays/darwin/vesktop.nix index 1939848..b026909 100644 --- a/.config/nix/overlays/darwin/vesktop.nix +++ b/.config/nix/overlays/darwin/vesktop.nix @@ -6,14 +6,12 @@ let version = "1.5.3"; in { vesktop = mkApp { - inherit (final) stdenv undmg; + inherit (final) stdenv undmg _7zz; pname = "Vesktop"; appFileName = "Vesktop*.app"; inherit version; - nativeBuildInputs = [ final._7zz ]; - src = final.fetchurl { url = "https://github.com/Vencord/Vesktop/releases/download/v${version}/Vesktop-${version}-universal.dmg"; hash = "sha256-ceOUNHSOaEqCbzkM64RtUu0Yhrq4tThcXZTDd+OsEXI";