diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
| commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
| tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/development/libraries/pipewire | |
| parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
| parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
| download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip | |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pipewire')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/pipewire/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index dc9fe52cf51f..cc12cd02a693 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, libv4l, alsaLib, ffmpeg, libjack2, udev, libva, xorg -, sbc, SDL2, makeFontsConf, freefont_ttf +, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg +, sbc, SDL2, makeFontsConf }: let - version = "0.2.5"; - fontsConf = makeFontsConf { - fontDirectories = [ freefont_ttf ]; + fontDirectories = [ ]; }; in stdenv.mkDerivation rec { - name = "pipewire-${version}"; + pname = "pipewire"; + version = "0.2.6"; src = fetchFromGitHub { owner = "PipeWire"; repo = "pipewire"; rev = version; - sha256 = "0hxm89ps6p75zm7rndrdr715p4ixx4f521fkjkyi7q2wh0b769s7"; + sha256 = "1rv1cprga0zy696pjk6gbb29p7nrbkvyla9iviii0pigflgnz6yl"; }; outputs = [ "out" "lib" "dev" "doc" ]; @@ -25,7 +24,7 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig doxygen graphviz valgrind ]; buildInputs = [ - glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer libv4l + glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 ]; |