summary refs log tree commit diff
path: root/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-11-19 14:35:53 -0500
committerworldofpeace <worldofpeace@protonmail.ch>2019-11-22 05:13:15 -0500
commitdaccdcfb779efd7508dbe3c4f77831c56b42fa25 (patch)
tree923ea8069f4761bdd1f73211247e9055f2fd3bac /pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
parentb8c90535c32f284ff1f6a6a6c6305338e3eb2a25 (diff)
downloadnixpkgs-daccdcfb779efd7508dbe3c4f77831c56b42fa25.tar
nixpkgs-daccdcfb779efd7508dbe3c4f77831c56b42fa25.tar.gz
nixpkgs-daccdcfb779efd7508dbe3c4f77831c56b42fa25.tar.bz2
nixpkgs-daccdcfb779efd7508dbe3c4f77831c56b42fa25.tar.lz
nixpkgs-daccdcfb779efd7508dbe3c4f77831c56b42fa25.tar.xz
nixpkgs-daccdcfb779efd7508dbe3c4f77831c56b42fa25.tar.zst
nixpkgs-daccdcfb779efd7508dbe3c4f77831c56b42fa25.zip
pantheon.switchboard-plug-network: 2.1.4 -> 2.2.0
Don't need pkgconfig override because of
* https://github.com/elementary/switchboard-plug-network/commit/d02cbe61cbea5902e5c72f28cbe8130b8210f030

https://github.com/elementary/switchboard-plug-network/releases/tag/2.2.0
Diffstat (limited to 'pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix')
-rw-r--r--pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix10
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 175f0e45f46..be4614df557 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-network";
-  version = "2.1.4";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "12lvcc15jngzsa40fjhxa6kccs58h5qq4lqrc7lcx5przmfaik8k";
+    sha256 = "0zg4bxrrw1nmm91yp8ymji7mha2wcjrwljcnpcvxq7lf8f2k0145";
   };
 
   passthru = {
@@ -49,14 +49,12 @@ stdenv.mkDerivation rec {
 
   patches = [
     (substituteAll {
-      src = ./nma.patch;
-      networkmanagerapplet = networkmanagerapplet;
+      src = ./fix-paths.patch;
+      inherit networkmanagerapplet;
     })
   ];
 
 
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
-
   meta = with stdenv.lib; {
     description = "Switchboard Networking Plug";
     homepage = https://github.com/elementary/switchboard-plug-network;