diff options
author | William A. Kennington III <william@wkennington.com> | 2015-03-26 13:12:50 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-03-26 13:12:58 -0700 |
commit | bb4bb9fc4326dc657f5ced9017bf26c84e832f2b (patch) | |
tree | 3f5c33e366795a0cf39be76d9c2a27db4f18abc3 /pkgs/tools/networking/modemmanager/default.nix | |
parent | c99fa3a2614d02227a182f822fd1f0adae488722 (diff) | |
download | nixpkgs-bb4bb9fc4326dc657f5ced9017bf26c84e832f2b.tar nixpkgs-bb4bb9fc4326dc657f5ced9017bf26c84e832f2b.tar.gz nixpkgs-bb4bb9fc4326dc657f5ced9017bf26c84e832f2b.tar.bz2 nixpkgs-bb4bb9fc4326dc657f5ced9017bf26c84e832f2b.tar.lz nixpkgs-bb4bb9fc4326dc657f5ced9017bf26c84e832f2b.tar.xz nixpkgs-bb4bb9fc4326dc657f5ced9017bf26c84e832f2b.tar.zst nixpkgs-bb4bb9fc4326dc657f5ced9017bf26c84e832f2b.zip |
modemmanager: 1.2.0 -> 1.4.6
Diffstat (limited to 'pkgs/tools/networking/modemmanager/default.nix')
-rw-r--r-- | pkgs/tools/networking/modemmanager/default.nix | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 0640f55bc9e..b044b526873 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ModemManager-${version}"; - version = "1.2.0"; + version = "1.4.6"; src = fetchurl { url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz"; - sha256 = "1g08ciyhys9bi5m45z30kln17zni4r07i5byjaglmwq6np1xincb"; + sha256 = "1kd5nn5rm88c8rgmzwy2fsf3cr7fai7r85mi61kcby0hcgsapv8c"; }; nativeBuildInputs = [ intltool pkgconfig ]; @@ -17,9 +17,25 @@ stdenv.mkDerivation rec { "--with-polkit" "--with-udev-base-dir=$(out)/lib/udev" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--sysconfdir=/etc" + "--localstatedir=/var" ]; + installFlags = [ "DESTDIR=\${out}" ]; + + preInstall = '' + mkdir -p $out/etc/systemd/system + ''; + postInstall = '' + mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system + rm -rf $out/$out/etc + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. ln -s $out/etc/systemd/system/ModemManager.service \ |