Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

1 files changed, 37 insertions, 14 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libgpod/default.nix b/nixpkgs/pkgs/development/libraries/libgpod/default.nix
index e56e512931a0..590aaf27c5f0 100644
--- a/nixpkgs/pkgs/development/libraries/libgpod/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgpod/default.nix
@@ -1,10 +1,23 @@
-{ stdenv, lib, fetchurl, perlPackages, intltool, autoreconfHook,
-  pkg-config, glib, libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib,
-  libimobiledevice,
-  monoSupport ? false, mono, gtk-sharp-2_0
+{ stdenv
+, lib
+, fetchurl
+, perlPackages
+, intltool
+, autoreconfHook
+, pkg-config
+, glib
+, libxml2
+, sqlite
+, zlib
+, sg3_utils
+, gdk-pixbuf
+, taglib
+, libimobiledevice
+, monoSupport ? false
+, mono
+, gtk-sharp-2_0
 }:
 
-
 stdenv.mkDerivation rec {
   pname = "libgpod";
   version = "0.8.3";
@@ -27,20 +40,30 @@ stdenv.mkDerivation rec {
     "--with-udev-dir=${placeholder "out"}/lib/udev"
   ] ++ lib.optionals monoSupport [ "--with-mono" ];
 
-  dontStrip = true;
-
-  propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
-    gdk-pixbuf taglib libimobiledevice ];
+  dontStrip = monoSupport;
 
   nativeBuildInputs = [ autoreconfHook intltool pkg-config ]
     ++ (with perlPackages; [ perl XMLParser ])
-    ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
+    ++ lib.optional monoSupport mono;
+
+  buildInputs = [
+    libxml2
+    sg3_utils
+    sqlite
+    taglib
+  ] ++ lib.optional monoSupport gtk-sharp-2_0;
+
+  propagatedBuildInputs = [
+    gdk-pixbuf
+    glib
+    libimobiledevice
+  ];
 
-  meta = {
-    homepage = "https://gtkpod.sourceforge.net/";
+  meta = with lib; {
+    homepage = "https://sourceforge.net/projects/gtkpod/";
     description = "Library used by gtkpod to access the contents of an ipod";
-    license = "LGPL";
-    platforms = lib.platforms.gnu ++ lib.platforms.linux;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
     maintainers = [ ];
   };
 }