diff --git a/default.nix b/default.nix
index b97df27..4f349e3 100644
--- a/default.nix
+++ b/default.nix
@@ -8,11 +8,11 @@ let
 in
 with pkgs;
 let
-  rustPlatform = recurseIntoAttrs (callPackage (import ./nix/rustPlatform.nix) {
+  rustPlatform = recurseIntoAttrs (callPackage ./nix/rustPlatform.nix {
     inherit rustManifest;
   });
-  adc2tcp = callPackage (import ./nix/adc2tcp.nix) { inherit rustPlatform; };
-  openocd = callPackage (import ./nix/openocd.nix) {};
+  adc2tcp = callPackage ./nix/adc2tcp.nix { inherit rustPlatform; };
+  openocd = callPackage ./nix/openocd.nix {};
 in
 stdenv.mkDerivation {
   name = "adc2tcp-dist";
diff --git a/release.nix b/release.nix
index f57b33c..7433d54 100644
--- a/release.nix
+++ b/release.nix
@@ -5,11 +5,13 @@
 
 with pkgs;
 let
-  adc2tcp = callPackage (import ./default.nix) {
+  gdb = callPackage ./nix/gdb.nix;
+  adc2tcp = callPackage ./default.nix {
     inherit rustManifest;
     mozillaOverlay = import <mozillaOverlay>;
   };
 in
 {
   build = lib.hydraJob adc2tcp;
+  gdb = lib.hydraJob gdb;
 }
diff --git a/shell.nix b/shell.nix
index fc83b06..0016a1e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -12,18 +12,9 @@ let
 in
 with pkgs;
 let
-  rustPlatform = callPackage (import ./nix/rustPlatform.nix) {};
-  openocd = callPackage (import ./nix/openocd.nix) {};
-  # TODO: gdb 8.2.1 from NixOS >= 19.XX is multiarch by default.
-  # remove the following as `gdb` is already in scope
-  gdb = pkgs.gdb.override {
-    stdenv = stdenv.override {
-      targetPlatform = {
-        config = "arm-none-eabihf";
-        libc = "newlib";
-      };
-    };
-  };
+  rustPlatform = callPackage ./nix/rustPlatform.nix {};
+  openocd = callPackage ./nix/openocd.nix {};
+  gdb = callPackage ./nix/gdb.nix {};
 in
 stdenv.mkDerivation {
   name = "adc2tcp-env";