diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-23 00:35:25 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-23 13:18:40 +0100 |
| commit | 1e225cc1b305635e2a70431e3f643f4ffb143d70 (patch) | |
| tree | 97e3aa8c7fe074b83c34fe4d8847dee5200986cb /pkgs/applications/audio/gtkpod/default.nix | |
| parent | 359f5b0ff76e26d1c7bf4bb29c9bc3e7088d8425 (diff) | |
| download | nixpkgs-1e225cc1b305635e2a70431e3f643f4ffb143d70.tar nixpkgs-1e225cc1b305635e2a70431e3f643f4ffb143d70.tar.gz nixpkgs-1e225cc1b305635e2a70431e3f643f4ffb143d70.tar.bz2 nixpkgs-1e225cc1b305635e2a70431e3f643f4ffb143d70.tar.lz nixpkgs-1e225cc1b305635e2a70431e3f643f4ffb143d70.tar.xz nixpkgs-1e225cc1b305635e2a70431e3f643f4ffb143d70.tar.zst nixpkgs-1e225cc1b305635e2a70431e3f643f4ffb143d70.zip | |
gtkpod: clean up
Diffstat (limited to 'pkgs/applications/audio/gtkpod/default.nix')
| -rw-r--r-- | pkgs/applications/audio/gtkpod/default.nix | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 39cd1a444fa..e0e620bd05f 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, - gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, +{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, + gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag, libvorbis, hicolor-icon-theme, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -11,24 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; - propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser - flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta - gnome.gdl gnome.defaultIconTheme - hicolor-icon-theme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + buildInputs = [ + curl gettext perl perlXMLParser + flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf + gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta + ]; patchPhase = '' 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; meta = with stdenv.lib; { |