From 5c141d1b072f2b31d8a7130b2ffa6f8536955048 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 7 Apr 2021 01:12:51 +0000 Subject: [PATCH] 3p/nixpkgs: add patch so dino builds --- .../nixpkgs/patches/dino-vala-boxing.patch | 19 +++++++++++++++++++ third_party/nixpkgs/patches/series | 1 + .../instant-messengers/dino/default.nix | 9 +++++++++ 3 files changed, 29 insertions(+) create mode 100644 third_party/nixpkgs/patches/dino-vala-boxing.patch diff --git a/third_party/nixpkgs/patches/dino-vala-boxing.patch b/third_party/nixpkgs/patches/dino-vala-boxing.patch new file mode 100644 index 0000000000..27ca512edc --- /dev/null +++ b/third_party/nixpkgs/patches/dino-vala-boxing.patch @@ -0,0 +1,19 @@ +diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix +--- a/pkgs/applications/networking/instant-messengers/dino/default.nix ++++ b/pkgs/applications/networking/instant-messengers/dino/default.nix +@@ -27,6 +27,15 @@ stdenv.mkDerivation rec { + sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw"; + }; + ++ patches = [ ++ # Fixes https://github.com/dino/dino/issues/1010 (double' is not a supported generic type argument) ++ (fetchpatch { ++ name = "dino-vala-boxing.patch"; ++ url = "https://github.com/dino/dino/commit/9acb54df9254609f2fe4de83c9047d408412de28.patch"; ++ sha256 = "1jz4r7d8b1ljwgq846wihp864b6gjdkgh6fnmxh13b2i10x52xsm"; ++ }) ++ ]; ++ + nativeBuildInputs = [ + vala + cmake diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 9e98ebae86..13de97c025 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,3 +1,4 @@ various.patch patch-cherrypy.patch pomerium-fix.patch +dino-vala-boxing.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index 0474f21a2b..29a69b4019 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -27,6 +27,15 @@ stdenv.mkDerivation rec { sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw"; }; + patches = [ + # Fixes https://github.com/dino/dino/issues/1010 (double' is not a supported generic type argument) + (fetchpatch { + name = "dino-vala-boxing.patch"; + url = "https://github.com/dino/dino/commit/9acb54df9254609f2fe4de83c9047d408412de28.patch"; + sha256 = "1jz4r7d8b1ljwgq846wihp864b6gjdkgh6fnmxh13b2i10x52xsm"; + }) + ]; + nativeBuildInputs = [ vala cmake