diff --git a/cabal2nix.cabal b/cabal2nix.cabal
--- a/cabal2nix.cabal
+++ b/cabal2nix.cabal
@@ -1,5 +1,5 @@
 Name:                   cabal2nix
-Version:                1.57
+Version:                1.58
 Copyright:              Peter Simons, Andres Loeh
 License:                BSD3
 License-File:           LICENSE
@@ -34,8 +34,8 @@
   .
   The only required argument is the path to the cabal file. For example:
   .
-  > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.57/cabal2nix.cabal
-  > cabal2nix cabal://cabal2nix-1.57
+  > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.58/cabal2nix.cabal
+  > cabal2nix cabal://cabal2nix-1.58
   .
   If the @--sha256@ option has not been specified, cabal2nix calls
   @nix-prefetch-url@ to determine the hash automatically. This causes
diff --git a/src/Cabal2Nix/Name.hs b/src/Cabal2Nix/Name.hs
--- a/src/Cabal2Nix/Name.hs
+++ b/src/Cabal2Nix/Name.hs
@@ -25,6 +25,8 @@
 libNixName "cairo-svg"          = return "cairo"
 libNixName "crypto"             = return "openssl"
 libNixName "gconf-2.0"          = return "gconf"
+libNixName "gdk-2.0"            = return "gtk"
+libNixName "gdk-pixbuf-2.0"     = return "gdk_pixbuf"
 libNixName "gio-2.0"            = return "glib"
 libNixName "glib-2.0"           = return "glib"
 libNixName "GL"                 = return "mesa"
@@ -63,6 +65,7 @@
 libNixName "pangocairo"         = return "pango"
 libNixName "pcre"               = return "pcre"
 libNixName "png"                = return "libpng"
+libNixName "poppler-glib"       = return "popplerGlib"
 libNixName "pq"                 = return "postgresql"
 libNixName "pthread"            = []
 libNixName "sndfile"            = return "libsndfile"
diff --git a/src/Cabal2Nix/PostProcess.hs b/src/Cabal2Nix/PostProcess.hs
--- a/src/Cabal2Nix/PostProcess.hs
+++ b/src/Cabal2Nix/PostProcess.hs
@@ -42,6 +42,7 @@
   | pname == "highlighting-kate"= highlightingKatePostProcessing deriv
   | pname == "HList"            = deriv { buildTools = "diffutils":buildTools }
   | pname == "hmatrix"          = deriv { extraLibs = "gsl":"liblapack":"blas":extraLibs }
+  | pname == "hoogle"           = deriv { testTarget = "--test-option=--no-net" }
   | pname == "hspec"            = deriv { doCheck = False }
   | pname == "idris"            = deriv { buildTools = "happy":buildTools, extraLibs = "gmp":"boehmgc":extraLibs }
   | pname == "language-c-quote" = deriv { buildTools = "alex":"happy":buildTools }
@@ -61,6 +62,7 @@
   | pname == "pango"            = deriv { extraLibs = "pkgconfig":"libc":extraLibs }
   | pname == "pcap"             = deriv { extraLibs = "libpcap":extraLibs }
   | pname == "persistent"       = deriv { extraLibs = "sqlite3":extraLibs }
+  | pname == "poppler"          = deriv { extraLibs = "libc":extraLibs }
   | pname == "repa-algorithms"  = deriv { extraLibs = "llvm":extraLibs }
   | pname == "repa-examples"    = deriv { extraLibs = "llvm":extraLibs }
   | pname == "SDL-image"        = deriv { extraLibs = "SDL_image":extraLibs }
@@ -168,11 +170,11 @@
 
 gitAnnexOverrides :: String
 gitAnnexOverrides = unlines
-  [ "installPhase = ''"
+  [ "preConfigure = ''"
   , "  export HOME=\"$NIX_BUILD_TOP/tmp\""
   , "  mkdir \"$HOME\""
-  , "  ./Setup install"
   , "'';"
+  , "installPhase = \"./Setup install\";"
   , "checkPhase = ''"
   , "  cp dist/build/git-annex/git-annex git-annex"
   , "  ./git-annex test"