diff --git a/flake.lock b/flake.lock index 699f89e..efb56e3 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1667610227, - "narHash": "sha256-2olA2HYnz07rjDq3lMqCmDRlSegp1WL4OqR3KSy3Hy4=", + "lastModified": 1669769690, + "narHash": "sha256-4EWH+awS1714npXmBMNrMS5jPU2QQ1PXWex49RNgjuM=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "78d9f25b7816f5711f80093721cf6618cda3e1c0", + "rev": "e8e0fd1f10b02c276a1a446e7ffd4f9c64613f5a", "type": "github" }, "original": { diff --git a/home/gui/firefox.nix b/home/gui/firefox.nix index d40f5ba..f3ea6b1 100644 --- a/home/gui/firefox.nix +++ b/home/gui/firefox.nix @@ -2,7 +2,7 @@ let # For now, we ignore this and don't install it - ffPkgs = if ( lib.hasSuffix "-darwin" pkgs.system ) + ffPkgs = if ( pkgs.stdenv.hostPlatform.isDarwin ) then pkgs.firefox-bin else pkgs.firefox-wayland.override { cfg.enableGnomeExtensions = true; }; diff --git a/overlays/hms.sh b/overlays/hms.sh index c04a1f0..005b3dc 100644 --- a/overlays/hms.sh +++ b/overlays/hms.sh @@ -30,9 +30,10 @@ if [ "$(uname -s)" == "Darwin" ]; then cd ~/.nix-profile/Applications for app in *.app; do echo "Updating permissions on '${app}'" + mkdir -p "${HOME}/Applications/${app}" chmod -R u+w "${HOME}/Applications/${app}" || true echo "Copying new version to Applications" - rsync -rptgoDv "${app}" "${HOME}/Applications" 2>&1 > /dev/null || true + rsync -rptgoDv "${app}/" "${HOME}/Applications/${app}/" 2>&1 > /dev/null || true if [ "$?" != "0" ]; then echo "An error occurred, proceeding anyway" fi