diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs')
2 files changed, 21 insertions, 0 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 86db11a3dc31..f174c41abc7b 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/infra/libkookie/nixpkgs/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; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 16e8c7e66c17..913fa58e2871 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -62,6 +62,12 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/5fa2882f765076d20c6ef4886198a34a05159f8a.patch"; sha256 = "1szryyy7shdmbvx9yhpi0bhzaayg7hl6pq2c456j1qf9kfv0m4hf"; }) + + # fix build with vala 0.48.9 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b1853b7427102b8dd94774e1e2cc455f50902263.patch"; + sha256 = "J3C71GyEHEZWSghGXlwXPHFJRhrvx6i0yvi8NIDb4WE="; + }) ]; PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers"; |