swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtkpod: clean up

Browse source
This commit is contained in:
Jan Tojnar 2018-03-23 00:35:25 +01:00
parent 359f5b0ff7
commit 1e225cc1b3
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/applications/audio/gtkpod/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, { stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag,
libvorbis, hicolor-icon-theme, gdk_pixbuf }: libvorbis, hicolor-icon-theme, gdk_pixbuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,24 +11,17 @@ stdenv.mkDerivation rec {
sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
}; };
propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
buildInputs = [
nativeBuildInputs = [ pkgconfig ]; curl gettext perl perlXMLParser
buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta
gnome.gdl gnome.defaultIconTheme ];
hicolor-icon-theme ];
patchPhase = '' patchPhase = ''
sed -i 's/which/type -P/' scripts/*.sh sed -i 's/which/type -P/' scripts/*.sh
''; '';
preFixup = ''
wrapProgram "$out/bin/gtkpod" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {

5
pkgs/top-level/all-packages.nix
View file

@ -15924,10 +15924,7 @@ with pkgs;
grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; }; grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
gtkpod = callPackage ../applications/audio/gtkpod { gtkpod = callPackage ../applications/audio/gtkpod { };
gnome = gnome3;
inherit (gnome2) libglade;
};
jbidwatcher = callPackage ../applications/misc/jbidwatcher { jbidwatcher = callPackage ../applications/misc/jbidwatcher {
java = if stdenv.isLinux then jre else jdk; java = if stdenv.isLinux then jre else jdk;