diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
| commit | 2fcb11a2442b27834db87b2f62511037c31b5e36 (patch) | |
| tree | e9d38370aac7632cd35207180dc7c87d2bb6171d /pkgs/os-specific/linux | |
| parent | 456ff62ff820bbb2debd4568a775d88e61fd8bd1 (diff) | |
| parent | fc4a8f63c4e46652d484b127162641be36481363 (diff) | |
| download | nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.gz nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.bz2 nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.lz nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.xz nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.zst nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/iw/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/piper/default.nix | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 7e50babc80aa..387792b86313 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,17 +1,18 @@ {stdenv, fetchurl, libnl, pkgconfig}: stdenv.mkDerivation rec { - name = "iw-4.14"; + pname = "iw"; + version = "5.0.1"; src = fetchurl { - url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; - sha256 = "12ddd6vh6vs97135bnlyr0szv7hvpbnmfh48584frzab0z0725ph"; + url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; + sha256 = "03awbfrr9i78vgwsa6z2c8g14mia9z8qzrvzxar2ad9299wylf0y"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl ]; - makeFlags = [ "PREFIX=\${out}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { description = "Tool to use nl80211"; diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index de5559c5434a..e177b284bbda 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; - buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ]; + buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; postPatch = '' |