Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

bottles: move GStreamer deps in a separate variable

+9 -6
+9 -6
pkgs/applications/misc/bottles/fhsenv.nix
··· 36 libXv 37 libXxf86vm 38 ]; 39 in 40 pkgs: with pkgs; [ 41 # https://wiki.winehq.org/Building_Wine ··· 48 gnutls 49 libglvnd 50 gsm 51 - gst_all_1.gstreamer 52 - gst_all_1.gst-plugins-base 53 - gst_all_1.gst-plugins-good 54 - gst_all_1.gst-plugins-ugly 55 - gst_all_1.gst-plugins-bad 56 - gst_all_1.gst-libav 57 libgphoto2 58 libjpeg_turbo 59 libkrb5 ··· 90 p11-kit 91 zlib # Freetype 92 ] ++ xorgDeps pkgs 93 ++ extraLibraries pkgs; 94 }; 95 in
··· 36 libXv 37 libXxf86vm 38 ]; 39 + gstreamerDeps = pkgs: with pkgs.gst_all_1; [ 40 + gstreamer 41 + gst-plugins-base 42 + gst-plugins-good 43 + gst-plugins-ugly 44 + gst-plugins-bad 45 + gst-libav 46 + ]; 47 in 48 pkgs: with pkgs; [ 49 # https://wiki.winehq.org/Building_Wine ··· 56 gnutls 57 libglvnd 58 gsm 59 libgphoto2 60 libjpeg_turbo 61 libkrb5 ··· 92 p11-kit 93 zlib # Freetype 94 ] ++ xorgDeps pkgs 95 + ++ gstreamerDeps pkgs 96 ++ extraLibraries pkgs; 97 }; 98 in