public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gsound: rename from gnome3.gsound

Browse Source
This commit is contained in:
worldofpeace 2018-12-25 17:47:20 -05:00
parent c1599d29d9
commit 702168a67c
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/video/pitivi/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook { stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
, python3Packages, gst_all_1, gtk3 , python3Packages, gst_all_1, gtk3
, gobject-introspection, librsvg, gnome3, libnotify , gobject-introspection, librsvg, gnome3, libnotify, gsound
, meson, ninja , meson, ninja
}: }:
@ -47,7 +47,7 @@ in python3Packages.buildPythonApplication rec {
nativeBuildInputs = [ meson ninja pkgconfig intltool itstool python3 wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkgconfig intltool itstool python3 wrapGAppsHook ];
buildInputs = [ buildInputs = [
gobject-introspection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound
gnome3.defaultIconTheme gnome3.defaultIconTheme
gnome3.gsettings-desktop-schemas libnotify gnome3.gsettings-desktop-schemas libnotify
gst-transcoder gst-transcoder

4
pkgs/desktops/gnome-3/default.nix
View File

@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr; clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -148,8 +148,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { }; gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { };
gsound = callPackage ./core/gsound { };
gucharmap = callPackage ./core/gucharmap { }; gucharmap = callPackage ./core/gucharmap { };
gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };

7
pkgs/desktops/gnome-3/core/gsound/default.nix → pkgs/development/libraries/gsound/default.nix
View File

@ -1,13 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobject-introspection, libtool, gnome3 }: { stdenv, fetchurl, pkgconfig, glib, libcanberra, gobject-introspection, libtool, gnome3 }:
let stdenv.mkDerivation rec {
pname = "gsound"; pname = "gsound";
version = "1.0.2"; version = "1.0.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
}; };
@ -17,7 +15,6 @@ in stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;
attrPath = "gnome3.${pname}";
}; };
}; };

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

@ -10089,6 +10089,8 @@ in
gsoap = callPackage ../development/libraries/gsoap { }; gsoap = callPackage ../development/libraries/gsoap { };
gsound = callPackages ../development/libraries/gsound { };
gss = callPackage ../development/libraries/gss { }; gss = callPackage ../development/libraries/gss { };
gtkimageview = callPackage ../development/libraries/gtkimageview { }; gtkimageview = callPackage ../development/libraries/gtkimageview { };