From 0fe0a8383513a41bb9bd3d14da44e4f167ea01bd Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 19 Oct 2021 19:07:12 -0400
Subject: [PATCH] routinator: remove patch

---
 pkgs/servers/routinator/Cargo.toml.patch | 13 -------------
 pkgs/servers/routinator/default.nix      | 13 +++++++------
 2 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/servers/routinator/Cargo.toml.patch

diff --git a/pkgs/servers/routinator/Cargo.toml.patch b/pkgs/servers/routinator/Cargo.toml.patch
deleted file mode 100644
index 8bda0299bc88..000000000000
--- a/pkgs/servers/routinator/Cargo.toml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 7f07b3b..7d7af0a 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -48,7 +48,7 @@ syslog          = "5.0.0"
- rustc_version   = "0.4.0"
- 
- [features]
--default = [ "socks", "ui"]
-+default = [ "socks" ]
- extra-debug = ["rpki/extra-debug"]
- socks = [ "reqwest/socks" ]
- rta = []
diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix
index 4f85650b87f9..aff0499b98bd 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@@ -1,7 +1,7 @@
 { lib
-, stdenv
-, fetchFromGitHub
 , rustPlatform
+, fetchFromGitHub
+, stdenv
 , Security
 }:
 
@@ -16,18 +16,19 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ThgTGtTZ0LGm9nHJoy0KhnBFWNvKRjk7hoNTVVTeL/Y=";
   };
 
-  cargoPatches = [
-    ./Cargo.toml.patch
-  ];
   cargoSha256 = "sha256-mcx+qUtTUxeYP0PeJp1eOQwsdS6PPUx/m7TfAyqFiIM=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
+  cargoBuildFlags = [ "--no-default-features" "--features=socks" ];
+
+  cargoTestFlags = cargoBuildFlags;
+
   meta = with lib; {
     description = "An RPKI Validator written in Rust";
     homepage = "https://github.com/NLnetLabs/routinator";
+    changelog = "https://github.com/NLnetLabs/routinator/blob/v${version}/Changelog.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ _0x4A6F ];
-    platforms = platforms.all;
   };
 }