nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

gst_all_1: cleanup, remove darwin from inputs

Browse Source
This commit is contained in:
Sandro Jäckel 2021-03-04 21:01:51 +01:00
parent cda4171d11
commit 40a88de407
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
12 changed files with 67 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchurl , fetchurl
, meson , meson
, ninja , ninja
@ -10,7 +11,7 @@
, gobject-introspection , gobject-introspection
, enableZbar ? false , enableZbar ? false
, faacSupport ? false , faacSupport ? false
, faac ? null , faac
, faad2 , faad2
, libass , libass
, libkate , libkate
@ -34,7 +35,6 @@
, bluez , bluez
, chromaprint , chromaprint
, curl , curl
, darwin
, directfb , directfb
, fdk_aac , fdk_aac
, flite , flite
@ -80,20 +80,23 @@
, libxml2 , libxml2
, srt , srt
, vo-aacenc , vo-aacenc
, VideoToolbox
, AudioToolbox
, AVFoundation
, CoreMedia
, CoreVideo
, Foundation
, MediaToolbox
}: }:
assert faacSupport -> faac != null; stdenv.mkDerivation rec {
let
inherit (lib) optional optionals;
in stdenv.mkDerivation rec {
pname = "gst-plugins-bad"; pname = "gst-plugins-bad";
version = "1.18.2"; version = "1.18.2";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "06ildd4rl6cynirv3p00d2ddf5is9svj4i7mkahldzhq24pq5mca"; sha256 = "06ildd4rl6cynirv3p00d2ddf5is9svj4i7mkahldzhq24pq5mca";
}; };
@ -110,7 +113,7 @@ in stdenv.mkDerivation rec {
python3 python3
gettext gettext
gobject-introspection gobject-introspection
] ++ optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
wayland # for wayland-scanner wayland # for wayland-scanner
]; ];
@ -166,16 +169,16 @@ in stdenv.mkDerivation rec {
libintl libintl
srt srt
vo-aacenc vo-aacenc
] ++ optionals enableZbar [ ] ++ lib.optionals enableZbar [
zbar zbar
] ++ optionals faacSupport [ ] ++ lib.optionals faacSupport [
faac faac
] ++ optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
bluez bluez
libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
wayland wayland
wayland-protocols wayland-protocols
] ++ optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
# wildmidi requires apple's OpenAL # wildmidi requires apple's OpenAL
# TODO: package apple's OpenAL, fix wildmidi, include on Darwin # TODO: package apple's OpenAL, fix wildmidi, include on Darwin
wildmidi wildmidi
@ -202,7 +205,7 @@ in stdenv.mkDerivation rec {
serd serd
sord sord
sratom sratom
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] ++ lib.optionals stdenv.isDarwin [
# For unknown reasons the order is important, e.g. if # For unknown reasons the order is important, e.g. if
# VideoToolbox is last, we get: # VideoToolbox is last, we get:
# fatal error: 'VideoToolbox/VideoToolbox.h' file not found # fatal error: 'VideoToolbox/VideoToolbox.h' file not found
@ -213,7 +216,7 @@ in stdenv.mkDerivation rec {
CoreVideo CoreVideo
Foundation Foundation
MediaToolbox MediaToolbox
]); ];
mesonFlags = [ mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
@ -251,10 +254,10 @@ in stdenv.mkDerivation rec {
"-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing
"-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing
] ]
++ optionals (!stdenv.isLinux) [ ++ lib.optionals (!stdenv.isLinux) [
"-Dva=disabled" # see comment on `libva` in `buildInputs` "-Dva=disabled" # see comment on `libva` in `buildInputs`
] ]
++ optionals stdenv.isDarwin [ ++ lib.optionals stdenv.isDarwin [
"-Dbluez=disabled" "-Dbluez=disabled"
"-Dchromaprint=disabled" "-Dchromaprint=disabled"
"-Ddirectfb=disabled" "-Ddirectfb=disabled"
@ -271,11 +274,11 @@ in stdenv.mkDerivation rec {
"-Dladspa=disabled" # requires lrdf "-Dladspa=disabled" # requires lrdf
"-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs "-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs
"-Dwildmidi=disabled" # see dependencies above "-Dwildmidi=disabled" # see dependencies above
] ++ optionals (!gst-plugins-base.glEnabled) [ ] ++ lib.optionals (!gst-plugins-base.glEnabled) [
"-Dgl=disabled"] "-Dgl=disabled"
++ optionals (!gst-plugins-base.waylandEnabled) [ ] ++ lib.optionals (!gst-plugins-base.waylandEnabled) [
"-Dwayland=disabled" "-Dwayland=disabled"
] ++ optionals (!gst-plugins-base.glEnabled) [ ] ++ lib.optionals (!gst-plugins-base.glEnabled) [
# `applemedia/videotexturecache.h` requires `gst/gl/gl.h`, # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,
# but its meson build system does not declare the dependency. # but its meson build system does not declare the dependency.
"-Dapplemedia=disabled" "-Dapplemedia=disabled"

9
pkgs/development/libraries/gstreamer/base/default.nix
View File

@ -31,7 +31,8 @@
# errors. Suspected is that a newer version than clang # errors. Suspected is that a newer version than clang
# is needed than 5.0 but it is not clear. # is needed than 5.0 but it is not clear.
, enableCocoa ? false , enableCocoa ? false
, darwin , Cocoa
, OpenGL
, enableGl ? (enableX11 || enableWayland || enableCocoa) , enableGl ? (enableX11 || enableWayland || enableCocoa)
, enableCdparanoia ? (!stdenv.isDarwin) , enableCdparanoia ? (!stdenv.isDarwin)
, cdparanoia , cdparanoia
@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x"; sha256 = "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x";
}; };
@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
libvisual libvisual
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
pango pango
darwin.apple_sdk.frameworks.OpenGL OpenGL
] ++ lib.optionals enableAlsa [ ] ++ lib.optionals enableAlsa [
alsaLib alsaLib
] ++ lib.optionals enableX11 [ ] ++ lib.optionals enableX11 [
@ -91,7 +92,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals enableWayland [ ] ++ lib.optionals enableWayland [
wayland wayland
wayland-protocols wayland-protocols
] ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa ] ++ lib.optional enableCocoa Cocoa
++ lib.optional enableCdparanoia cdparanoia; ++ lib.optional enableCdparanoia cdparanoia;
propagatedBuildInputs = [ propagatedBuildInputs = [

2
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
outputBin = "dev"; outputBin = "dev";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6"; sha256 = "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6";
}; };

10
pkgs/development/libraries/gstreamer/default.nix
View File

@ -1,17 +1,17 @@
{ callPackage, CoreServices }: { callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox }:
rec { rec {
gstreamer = callPackage ./core { inherit CoreServices; }; gstreamer = callPackage ./core { inherit CoreServices; };
gstreamermm = callPackage ./gstreamermm { }; gstreamermm = callPackage ./gstreamermm { };
gst-plugins-base = callPackage ./base { inherit gstreamer; }; gst-plugins-base = callPackage ./base { inherit gstreamer Cocoa OpenGL; };
gst-plugins-good = callPackage ./good { inherit gst-plugins-base; }; gst-plugins-good = callPackage ./good { inherit gst-plugins-base Cocoa; };
gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base; }; gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; };
gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; }; gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base CoreFoundation DiskArbitration IOKit; };
gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base gst-plugins-bad; }; gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base gst-plugins-bad; };

2
pkgs/development/libraries/gstreamer/devtools/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
version = "1.18.2"; version = "1.18.2";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "0mhascwvgirgh7b5dykpnk06f7f5g62gh3sl30i6kygiidqkv9vf"; sha256 = "0mhascwvgirgh7b5dykpnk06f7f5g62gh3sl30i6kygiidqkv9vf";
}; };

2
pkgs/development/libraries/gstreamer/ges/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
]; ];
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15"; sha256 = "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15";
}; };

42
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -25,13 +25,13 @@
, libsoup , libsoup
, libpulseaudio , libpulseaudio
, libintl , libintl
, darwin , Cocoa
, lame , lame
, mpg123 , mpg123
, twolame , twolame
, gtkSupport ? false, gtk3 ? null , gtkSupport ? false, gtk3
, qt5Support ? false, qt5 ? null , qt5Support ? false, qt5
, raspiCameraSupport ? false, libraspberrypi ? null , raspiCameraSupport ? false, libraspberrypi
, enableJack ? true, libjack2 , enableJack ? true, libjack2
, libXdamage , libXdamage
, libXext , libXext
@ -44,12 +44,8 @@
, wavpack , wavpack
}: }:
assert gtkSupport -> gtk3 != null; assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64);
let
inherit (lib) optionals;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gst-plugins-good"; pname = "gst-plugins-good";
version = "1.18.2"; version = "1.18.2";
@ -57,7 +53,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp"; sha256 = "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp";
}; };
@ -68,7 +64,7 @@ stdenv.mkDerivation rec {
ninja ninja
gettext gettext
nasm nasm
] ++ optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
wayland-protocols wayland-protocols
]; ];
@ -98,39 +94,39 @@ stdenv.mkDerivation rec {
xorg.libXfixes xorg.libXfixes
xorg.libXdamage xorg.libXdamage
wavpack wavpack
] ++ optionals raspiCameraSupport [ ] ++ lib.optionals raspiCameraSupport [
libraspberrypi libraspberrypi
] ++ optionals gtkSupport [ ] ++ lib.optionals gtkSupport [
# for gtksink # for gtksink
gtk3 gtk3
] ++ optionals qt5Support (with qt5; [ ] ++ lib.optionals qt5Support (with qt5; [
qtbase qtbase
qtdeclarative qtdeclarative
qtwayland qtwayland
qtx11extras qtx11extras
]) ++ optionals stdenv.isDarwin [ ]) ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Cocoa Cocoa
] ++ optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
libv4l libv4l
libpulseaudio libpulseaudio
libavc1394 libavc1394
libiec61883 libiec61883
libgudev libgudev
wayland wayland
] ++ optionals enableJack [ ] ++ lib.optionals enableJack [
libjack2 libjack2
]; ];
mesonFlags = [ mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
] ++ optionals (!qt5Support) [ ] ++ lib.optionals (!qt5Support) [
"-Dqt5=disabled" "-Dqt5=disabled"
] ++ optionals (!gtkSupport) [ ] ++ lib.optionals (!gtkSupport) [
"-Dgtk3=disabled" "-Dgtk3=disabled"
] ++ optionals (!enableJack) [ ] ++ lib.optionals (!enableJack) [
"-Djack=disabled" "-Djack=disabled"
] ++ optionals (!stdenv.isLinux) [ ] ++ lib.optionals (!stdenv.isLinux) [
"-Ddv1394=disabled" # Linux only "-Ddv1394=disabled" # Linux only
"-Doss4=disabled" # Linux only "-Doss4=disabled" # Linux only
"-Doss=disabled" # Linux only "-Doss=disabled" # Linux only
@ -138,7 +134,7 @@ stdenv.mkDerivation rec {
"-Dv4l2-gudev=disabled" # Linux-only "-Dv4l2-gudev=disabled" # Linux-only
"-Dv4l2=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only
"-Dximagesrc=disabled" # Linux-only "-Dximagesrc=disabled" # Linux-only
] ++ optionals (!raspiCameraSupport) [ ] ++ lib.optionals (!raspiCameraSupport) [
"-Drpicamsrc=disabled" "-Drpicamsrc=disabled"
]; ];

2
pkgs/development/libraries/gstreamer/libav/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
version = "1.18.2"; version = "1.18.2";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in"; sha256 = "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in";
}; };

2
pkgs/development/libraries/gstreamer/rtsp-server/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
version = "1.18.2"; version = "1.18.2";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1qjlp7az0hkzxvq53hwnp55sp6xhbybfwzaj66hp45jslsmj4fcp"; sha256 = "1qjlp7az0hkzxvq53hwnp55sp6xhbybfwzaj66hp45jslsmj4fcp";
}; };

10
pkgs/development/libraries/gstreamer/ugly/default.nix
View File

@ -16,7 +16,9 @@
, libintl , libintl
, lib , lib
, opencore-amr , opencore-amr
, darwin , IOKit
, CoreFoundation
, DiskArbitration
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3"; sha256 = "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3";
}; };
@ -49,11 +51,11 @@ stdenv.mkDerivation rec {
x264 x264
libintl libintl
opencore-amr opencore-amr
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] ++ lib.optionals stdenv.isDarwin [
IOKit IOKit
CoreFoundation CoreFoundation
DiskArbitration DiskArbitration
]); ];
mesonFlags = [ mesonFlags = [
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing

2
pkgs/development/libraries/gstreamer/vaapi/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
version = "1.18.2"; version = "1.18.2";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1h67n7wk1297rzynknbyv44gdacblvkcvb37x8yxi5d0zms2qywc"; sha256 = "1h67n7wk1297rzynknbyv44gdacblvkcvb37x8yxi5d0zms2qywc";
}; };

2
pkgs/top-level/all-packages.nix
View File

@ -14181,7 +14181,7 @@ in
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
callPackage = newScope { libav = pkgs.ffmpeg; }; callPackage = newScope { libav = pkgs.ffmpeg; };
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox;
}); });
gusb = callPackage ../development/libraries/gusb { }; gusb = callPackage ../development/libraries/gusb { };