From 372e3a118dbf4b02a5c99aff69688d3e7672e34d Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Sat, 24 Oct 2020 11:50:47 -0400 Subject: [PATCH] pantheon.switchboard-plug-about: patch some bugfixes Hopefully fix https://github.com/NixOS/nixpkgs/issues/101221. Though that issue is flaky on the reproducibility. --- .../apps/switchboard-plugs/about/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 86db11a3dc31..f174c41abc7b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , substituteAll @@ -47,6 +48,20 @@ stdenv.mkDerivation rec { ]; patches = [ + # Get OS Info from GLib.Environment + # https://github.com/elementary/switchboard-plug-about/pull/128 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-about/commit/5ed29988e3a895b2df66e5529df0f12a94d5517c.patch"; + sha256 = "1ipDxnpDZjpSEzZdtOeNe5U+QOXiB5M+hC3yDAsl/rQ="; + }) + + # Use Pretty Name + # https://github.com/elementary/switchboard-plug-about/pull/134 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-about/commit/653d131dc8fac10ae7523f2bf6b179ffffa9c0fd.patch"; + sha256 = "AsM49Dc9/yn2tG6fqjfedeOlDXUu+iEoyNUmNYLH+zE="; + }) + (substituteAll { src = ./fix-paths.patch; inherit pciutils;