summary refs log tree commit diff
path: root/pkgs/development/libraries/gdk-pixbuf/default.nix
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-02-28 16:11:36 -0600
committerWill Dietz <w@wdtz.org>2019-02-28 16:49:18 -0600
commit9866979c230e7777278cce3c3cb56fcbd953874f (patch)
tree91cf4ad830eb775800b96bd25d6cb1ac69e2ba49 /pkgs/development/libraries/gdk-pixbuf/default.nix
parente416d2f8b9ac47ee5c35f5029f7eeca91dbadf35 (diff)
downloadnixpkgs-9866979c230e7777278cce3c3cb56fcbd953874f.tar
nixpkgs-9866979c230e7777278cce3c3cb56fcbd953874f.tar.gz
nixpkgs-9866979c230e7777278cce3c3cb56fcbd953874f.tar.bz2
nixpkgs-9866979c230e7777278cce3c3cb56fcbd953874f.tar.lz
nixpkgs-9866979c230e7777278cce3c3cb56fcbd953874f.tar.xz
nixpkgs-9866979c230e7777278cce3c3cb56fcbd953874f.tar.zst
nixpkgs-9866979c230e7777278cce3c3cb56fcbd953874f.zip
gdk-pixbuf: 2.38.0 -> 2.38.1
https://gitlab.gnome.org/GNOME/gdk-pixbuf/tags/2.38.1
Diffstat (limited to 'pkgs/development/libraries/gdk-pixbuf/default.nix')
-rw-r--r--pkgs/development/libraries/gdk-pixbuf/default.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 20f05d28bfe..d98d9e8107e 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -4,28 +4,18 @@
 
 let
   pname = "gdk-pixbuf";
-  version = "2.38.0";
+  version = "2.38.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x";
+    sha256 = "0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi";
   };
 
   patches = [
-    # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
-    # which requires access to shared-mime-info files during runtime.
-    # For now, we are patching the build script to avoid the dependency.
-    ./no-mime-sniffing.patch
-
     # Move installed tests to a separate output
     ./installed-tests-path.patch
-
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/a7d582f75a71320554b881e063a65f4ced679c1c.patch;
-      sha256 = "0z0w52bh4hcrdllbgrqvh12iqzr7k1pb0wdr9vz2qslg1kjk4j92";
-    })
   ];
 
   outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
@@ -48,6 +38,7 @@ in stdenv.mkDerivation rec {
     "-Djasper=true"
     "-Dx11=true"
     "-Dgir=${if gobject-introspection != null then "true" else "false"}"
+    "-Dgio_sniffing=false"
   ];
 
   postPatch = ''