diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:05:50 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:05:50 +0200 |
commit | 12949bf84ab06bebb854a07082bf5c32f5e14892 (patch) | |
tree | e521ba305aa4848b216a15e2eac0e69acdb0d1e9 /pkgs/desktops | |
parent | e1625a8377ecce59b1320e556aecdc60b9e6d9db (diff) | |
parent | 1ae2f10642ea00a423354dd3176c55e47dbf3f6e (diff) | |
download | nixpkgs-12949bf84ab06bebb854a07082bf5c32f5e14892.tar nixpkgs-12949bf84ab06bebb854a07082bf5c32f5e14892.tar.gz nixpkgs-12949bf84ab06bebb854a07082bf5c32f5e14892.tar.bz2 nixpkgs-12949bf84ab06bebb854a07082bf5c32f5e14892.tar.lz nixpkgs-12949bf84ab06bebb854a07082bf5c32f5e14892.tar.xz nixpkgs-12949bf84ab06bebb854a07082bf5c32f5e14892.tar.zst nixpkgs-12949bf84ab06bebb854a07082bf5c32f5e14892.zip |
Merge master into staging
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix | 35 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 2 |
2 files changed, 37 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix new file mode 100644 index 00000000000..60953d99ac2 --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3 }: + +let + pname = "gnome-sound-recorder"; + version = "3.28.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0y0srj1hvr1waa35p6dj1r1mlgcsscc0i99jni50ijp4zb36fjqy"; + }; + + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook ]; + buildInputs = [ gjs glib gtk3 gdk_pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); + + # TODO: fix this in gstreamer + # TODO: make stdenv.lib.getBin respect outputBin + PKG_CONFIG_GSTREAMER_1_0_TOOLSDIR = "${gst_all_1.gstreamer.dev}/bin"; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "A simple and modern sound recorder"; + homepage = https://wiki.gnome.org/Apps/SoundRecorder; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 9d62bead40d..b456ff6c95f 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -289,6 +289,8 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-power-manager = callPackage ./apps/gnome-power-manager { }; + gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; + gnome-weather = callPackage ./apps/gnome-weather { }; nautilus-sendto = callPackage ./apps/nautilus-sendto { }; |