diff --git a/pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch b/pkgs/by-name/cv/cvc3/cvc3-2.4.1-gccv6-fix.patch
similarity index 100%
rename from pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch
rename to pkgs/by-name/cv/cvc3/cvc3-2.4.1-gccv6-fix.patch
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/by-name/cv/cvc3/package.nix
similarity index 71%
rename from pkgs/applications/science/logic/cvc3/default.nix
rename to pkgs/by-name/cv/cvc3/package.nix
index 8c5f6b146d1b..65e174884043 100644
--- a/pkgs/applications/science/logic/cvc3/default.nix
+++ b/pkgs/by-name/cv/cvc3/package.nix
@@ -1,24 +1,29 @@
 {
   lib,
-  stdenv,
+  gccStdenv,
   fetchurl,
   flex,
   bison,
   gmp,
   perl,
 }:
-
-stdenv.mkDerivation rec {
+let
+  gmp' = lib.overrideDerivation gmp (_: {
+    dontDisableStatic = true;
+  });
+  stdenv = gccStdenv;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "cvc3";
   version = "2.4.1";
 
   src = fetchurl {
-    url = "https://cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym";
+    url = "https://cs.nyu.edu/acsys/cvc3/releases/${finalAttrs.version}/cvc3-${finalAttrs.version}.tar.gz";
+    hash = "sha256-1VsdYAbPusP21MCGlkVYkCw+0O+masSZz7IZPz7krPc=";
   };
 
   buildInputs = [
-    gmp
+    gmp'
     flex
     bison
     perl
@@ -28,8 +33,8 @@ stdenv.mkDerivation rec {
 
   # fails to configure on darwin due to gmp not found
   configureFlags = [
-    "LIBS=-L${gmp}/lib"
-    "CXXFLAGS=-I${gmp.dev}/include"
+    "LIBS=-L${gmp'}/lib"
+    "CXXFLAGS=-I${gmp'.dev}/include"
   ];
 
   postPatch = ''
@@ -55,4 +60,4 @@ stdenv.mkDerivation rec {
       downloadPage = "https://cs.nyu.edu/acsys/cvc3/download.html";
     };
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 633ed0104f49..eb3e10d2ce73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11857,13 +11857,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  cvc3 = callPackage ../applications/science/logic/cvc3 {
-    gmp = lib.overrideDerivation gmp (_: {
-      dontDisableStatic = true;
-    });
-    stdenv = gccStdenv;
-  };
-
   ekrhyper = callPackage ../applications/science/logic/ekrhyper {
     ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
   };