diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
| commit | 50053cda79099c9a0b2a7803aef61f730a54848f (patch) | |
| tree | 6413bbed5cbdd3f58d26d54cbf1b37d54a8c3a22 /nixpkgs/pkgs/os-specific/linux/iwd | |
| parent | 7fbd32a525182f2089e1098723219a1a4ef264bb (diff) | |
| parent | 36f316007494c388df1fec434c1e658542e3c3cc (diff) | |
| download | nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.gz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.bz2 nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.lz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.xz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.zst nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.zip | |
Merge commit '36f316007494c388df1fec434c1e658542e3c3cc'
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/iwd')
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/iwd/default.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index acf28a1bca7a..fc7eda0af88c 100644 --- a/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/iwd/default.nix @@ -3,17 +3,17 @@ let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "0.15"; - sha256 = "1jwk5gxcs964ddca9asw6fvc4h9q8d2x1y3linfi11b5vf30bghn"; + rev = "0.17"; + sha256 = "0yk1qmvpy61qp82bb0w55n062jqzlkzbz0b1v5k763j98czz9rvz"; }; in stdenv.mkDerivation rec { name = "iwd-${version}"; - version = "0.12"; + version = "0.14"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "156zq3zqa2vfmvy3yv9lng23mhrhlgwh0p2x3fcn10nkks9q89pn"; + sha256 = "08ijlnwvj1w354gbv3hdnm3l4iy24qzq4bq5a9z0wynysasw09lv"; }; nativeBuildInputs = [ @@ -32,13 +32,10 @@ in stdenv.mkDerivation rec { python3Packages.pygobject3 ]; - # Enable when it works again - enableParallelBuilding = false; - configureFlags = [ - "--with-dbus-datadir=$(out)/etc/" - "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/" - "--with-systemd-unitdir=$(out)/lib/systemd/system/" + "--with-dbus-datadir=${placeholder "out"}/etc/" + "--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/" + "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/" "--localstatedir=/var/" "--enable-wired" ]; @@ -60,9 +57,9 @@ in stdenv.mkDerivation rec { ''; postFixup = '' - substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.ead.service \ + substituteInPlace $out/share/dbus-1/system-services/net.connman.ead.service \ --replace /bin/false ${coreutils}/bin/false - substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \ + substituteInPlace $out/share/dbus-1/system-services/net.connman.iwd.service \ --replace /bin/false ${coreutils}/bin/false ''; |