diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix
index 4b0e05acf98..cf27bfa5ef1 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/pkgs/development/libraries/libdv/default.nix
@@ -1,15 +1,21 @@
 args:
 let edf = args.lib.enableDisableFeature; in
 ( args.mkDerivationByConfiguration {
-    flagConfig = { }
+    flagConfig = {
+      mandatory = { buildInputs = [ "popt" "pkgconfig" ]; };
+      libX11 = { cfgOption = "--with-x11"; buildInputs = "libX11"; };
+      no_libX11 = { cfgOption = "--without-x11"; };
+    }
       # TODO! implement flags
       # I want to get kino and cinelerra working. That's why I don't spend more time on this now
       // edf "libtool_lock" "libtool_lock" { } #avoid locking (might break parallel builds)
       // edf "asm" "asm" { } #disable use of architecture specific assembly code
-      // edf "sdl" "sdl" { } #enable use of SDL for display
-      // edf "gtk" "gtk" { } #disable use of gtk for display
-      // edf "xv" "xv" { } #disable use of XVideo extension for display
+      // edf "SDL" "sdl" { buildInputs = "SDL"; } #enable use of SDL for display
+      // edf "gtk" "gtk" { buildInputs = "gtk"; } #disable use of gtk for display
+      // edf "libXv" "xv" { buildInputs = "libXv"; } #disable use of XVideo extension for display
       // edf "gprof" "gprof" { } #enable compiler options for gprof profiling
+      // edf "shared" "shared" { }
+      // edf "static" "static" { }
     ;
 
     extraAttrs = co : {
@@ -20,11 +26,13 @@ let edf = args.lib.enableDisableFeature; in
         sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3";
       };
 
-    meta = { 
-      description = "software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
-      homepage = http://sourceforge.net/projects/libdv/;
-      # you can choose one of the following licenses: 
-      license = [];
+      meta = {
+        description = "software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
+        homepage = http://sourceforge.net/projects/libdv/;
+        # you can choose one of the following licenses:
+        license = [];
+      };
     };
-  };
+  optionals = [ "SDL" "gtk" "libXv" "libX11" ];
+  defaults = [ "shared" "libtool_lock" ];
 } ) args
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8125a35af53..5ce9ee7eca3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2154,7 +2154,8 @@ rec {
   } null;
 
   libdv = import ../development/libraries/libdv {
-    inherit fetchurl stdenv lib mkDerivationByConfiguration;
+    inherit fetchurl stdenv lib mkDerivationByConfiguration SDL popt pkgconfig;
+    inherit (xorg) libXv libX11;
   };
 
   libdrm = import ../development/libraries/libdrm {