Merge pull request #2125 from lethalman/gnome-disk-utility

Gnome disk utility, libpwquality, libdvdread
This commit is contained in:
Domen Kožar 2014-04-04 19:04:33 +02:00
commit 9f96b8e43d
6 changed files with 72 additions and 20 deletions

View file

@ -1,24 +1,13 @@
{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, libcanberra, accountservice
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk, pulseaudio, fontconfig
, cracklib, python, krb5, networkmanagerapplet, libwacom, samba, libnotify, libxkbfile
, shared_mime_info, tzdata, icu, libtool, docbook_xsl, docbook_xsl_ns, makeWrapper }:
{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
, libcanberra, accountservice, libpwquality, pulseaudio, fontconfig
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk, libxkbfile
, cracklib, python, krb5, networkmanagerapplet, libwacom, samba, libnotify
, shared_mime_info, tzdata, icu, libtool, docbook_xsl, docbook_xsl_ns }:
# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
# TODO: bluetooth, networkmanager, wacom, smbclient, printers
let
libpwquality = stdenv.mkDerivation rec {
name = "libpwquality-1.2.3";
src = fetchurl {
url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2";
sha256 = "0sjiabvl5277nfxyy96jdz65a0a3pmkkwrfbziwgik83gg77j75i";
};
buildInputs = [ cracklib python ];
};
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "gnome-control-center-3.10.2";
src = fetchurl {

View file

@ -0,0 +1,47 @@
{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify
, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
stdenv.mkDerivation rec {
name = "gnome-disk-utility-3.12.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-disk-utility/3.12/${name}.tar.xz";
sha256 = "46e0698c4a7baa8719a79935066e103447011fb47528a28dbb49e35eeec409d8";
};
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme
librsvg udisks2 gnome3.gnome_settings_daemon
hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
libxslt libtool libsecret libpwquality cracklib
libnotify libdvdread libcanberra_gtk3 docbook_xsl
gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
installFlags = "gsettingsschemadir=\${out}/share/gnome-disk-utility/glib-2.0/schemas/";
postInstall = ''
wrapProgram "$out/bin/gnome-disks" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gnome-disk-utility:$XDG_ICON_DIRS"
'';
preFixup = ''
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {
homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
description = "A udisks graphical front-end";
maintainers = with maintainers; [ lethalman ];
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -44,6 +44,8 @@ rec {
gnome_common = callPackage ./core/gnome-common { };
gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
gnome_icon_theme = callPackage ./core/gnome-icon-theme { };

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, libdvdcss}:
stdenv.mkDerivation {
name = "libdvdread-4.1.3";
name = "libdvdread-4.2.1";
src = fetchurl {
url = http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-4.1.3.tar.bz2;
sha1 = "fc4c7ba3e49929191e057b435bc4f867583ea8d5";
url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.2.1.tar.xz;
sha256 = "af9b98f049580a6521d56c978b736d3d609562dd12955e11d50e26d97542dcd4";
};
buildInputs = [libdvdcss];

View file

@ -0,0 +1,12 @@
{ stdenv, cracklib, fetchurl, python }:
stdenv.mkDerivation rec {
name = "libpwquality-1.2.3";
src = fetchurl {
url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2";
sha256 = "0sjiabvl5277nfxyy96jdz65a0a3pmkkwrfbziwgik83gg77j75i";
};
buildInputs = [ cracklib python ];
}

View file

@ -5112,6 +5112,8 @@ let
libpseudo = callPackage ../development/libraries/libpseudo { };
libpwquality = callPackage ../development/libraries/libpwquality { };
libqalculate = callPackage ../development/libraries/libqalculate { };
librsvg = callPackage ../development/libraries/librsvg {