Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b6be4a44d89b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8c574b8430dc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 21, 2019

  1. mullvad-vpn: init at 2019.5

    @lambdaloop @worldofpeace
    lambdaloop authored and worldofpeace committed Jun 21, 2019
    Copy the full SHA
    1a94bc5 View commit details

  2. Merge pull request #63420 from lambdaloop/mullvad-new 

    mullvad-vpn: init at 2019.5
    @worldofpeace
    worldofpeace authored Jun 21, 2019
    Copy the full SHA
    8c574b8 View commit details
Showing with 95 additions and 0 deletions.
  1. +93 −0 pkgs/applications/networking/mullvad-vpn/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
93 changes: 93 additions & 0 deletions pkgs/applications/networking/mullvad-vpn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{ stdenv, makeWrapper, fetchurl, dpkg
, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
, gdk_pixbuf, glib, gnome2, pango, nspr, nss, gtk3
, xorg, autoPatchelfHook, systemd, libnotify
}:

let deps = [
alsaLib
atk
cairo
cups
dbus
expat
fontconfig
freetype
gdk_pixbuf
glib
gnome2.GConf
pango
gtk3
libnotify
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libxcb
nspr
nss
systemd
];

in

stdenv.mkDerivation rec {
pname = "mullvad-vpn";
version = "2019.5";

src = fetchurl {
url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
sha256 = "542a93521906cd5e97075c9f3e9088c19562b127556a3de151e25bc66b11fe0b";
};

nativeBuildInputs = [
autoPatchelfHook
dpkg
];

buildInputs = deps;

dontBuild = true;
dontConfigure = true;

unpackPhase = "dpkg-deb -x $src .";

runtimeDependencies = [ systemd.lib libnotify ];

installPhase = ''
runHook preInstall
mkdir -p $out/share/mullvad $out/bin
mv usr/share/* $out/share
mv usr/bin/* $out/bin
mv opt/Mullvad\ VPN/* $out/share/mullvad
sed -i 's|\/opt\/Mullvad.*VPN|'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop
sed -i 's|\/opt\/Mullvad.*VPN/resources|'$out'/bin|g' $out/share/mullvad/resources/mullvad-daemon.service
ln -s $out/share/mullvad/mullvad-vpn $out/bin/mullvad-vpn
ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon
mkdir -p $out/etc/systemd/system
ln -s $out/share/mullvad/resources/mullvad-daemon.service $out/etc/systemd/system/mullvad-daemon.service
runHook postInstall
'';

meta = with stdenv.lib; {
homepage = "https://github.com/mullvad/mullvadvpn-app";
description = "Client for Mullvad VPN";
changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
license = licenses.gpl3;
platforms = [ "x86_64-linux" ];
};

}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -14360,6 +14360,8 @@ in

morty = callPackage ../servers/web-apps/morty { };

mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { };

myserver = callPackage ../servers/http/myserver { };

nas = callPackage ../servers/nas { };