Commit 07f09fcb authored by Cole Helbling's avatar Cole Helbling
Browse files

mullvad: 2024.6 -> 2024.7 

Also go back to the `GOBIN` hack in libwg. I don't know why it was
working before and not now, but 🤷
parent 664e2162

pkgs/applications/networking/mullvad/libwg.nix

+7 −1
Original line number Diff line number Diff line
@@ -14,8 +14,14 @@ buildGoModule { 
  proxyVendor = true;

  vendorHash = "sha256-uyAzY1hoCtS7da3wtjxTGx5wBb9c9m749TzihVr94rc=";



  # XXX: hack to make the ar archive go to the correct place

  # This is necessary because passing `-o ...` to `ldflags` does not work

  # (this doesn't get communicated everywhere in the chain, apparently, so

  # `go` complains that it can't find an `a.out` file).

  GOBIN = "${placeholder "out"}/lib";



  subPackages = [ "." ];

  ldflags = [ "-s" "-w" "-buildmode=c-archive" "-o" "${placeholder "out"}/lib" ];

  ldflags = [ "-s" "-w" "-buildmode=c-archive" ];

  tags = [ "daita" ];



  postInstall = ''

pkgs/applications/networking/mullvad/mullvad.nix

+2 −2
Original line number Diff line number Diff line
@@ -27,14 +27,14 @@ let 
in

rustPlatform.buildRustPackage rec {

  pname = "mullvad";

  version = "2024.6";

  version = "2024.7";



  src = fetchFromGitHub {

    owner = "mullvad";

    repo = "mullvadvpn-app";

    rev = version;

    fetchSubmodules = true;

    hash = "sha256-ub0BzSwAwKLfK1xZr1Ug4ZQLNEYVq0yL+XSLN4K6XFA=";

    hash = "sha256-me0e8Cb1dRrnAeiCmsXiclcDMruVLV3t0eGAM3RU1es=";

  };



  cargoLock = {