Unverified Commit 8c6769c7 authored by Sandro Jäckel's avatar Sandro Jäckel
Browse files

guvcview: cleanup superfluous code

parent 04a14923

pkgs/os-specific/linux/guvcview/default.nix

+10 −11
Original line number Diff line number Diff line
@@ -16,18 +16,16 @@ 
  libpng,

  sfml_2,

  pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,

  libpulseaudio ? null,

  libpulseaudio,

  useQt ? false,

  qtbase ? null,

  wrapQtAppsHook ? null,

  # can be turned off if used as a library

  useGtk ? true,

  gtk3 ? null,

  gtk3,

  wrapGAppsHook3 ? null,

}:



assert pulseaudioSupport -> libpulseaudio != null;



stdenv.mkDerivation (finalAttrs: {

  version = "2.1.0";

  pname = "guvcview";
@@ -42,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: { 
      intltool

      pkg-config

    ]

    ++ lib.optionals (useGtk) [ wrapGAppsHook3 ]

    ++ lib.optionals (useQt) [ wrapQtAppsHook ];

    ++ lib.optionals useGtk [ wrapGAppsHook3 ]

    ++ lib.optionals useQt [ wrapQtAppsHook ];



  buildInputs =

    [
@@ -58,17 +56,18 @@ stdenv.mkDerivation (finalAttrs: { 
      libpng

      sfml_2

    ]

    ++ lib.optionals (pulseaudioSupport) [ libpulseaudio ]

    ++ lib.optionals (useGtk) [ gtk3 ]

    ++ lib.optionals (useQt) [

    ++ lib.optionals pulseaudioSupport [ libpulseaudio ]

    ++ lib.optionals useGtk [ gtk3 ]

    ++ lib.optionals useQt [

      qtbase

    ];



  configureFlags =

    [

      "--enable-sfml"

    ]

    ++ lib.optionals (useGtk) [ "--enable-gtk3" ]

    ++ lib.optionals (useQt) [ "--enable-qt5" ];

    ++ lib.optionals useGtk [ "--enable-gtk3" ]

    ++ lib.optionals useQt [ "--enable-qt5" ];



  meta = {

    description = "Simple interface for devices supported by the linux UVC driver";