Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e36df1524ed8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 19ccdd4ca2ee
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 28, 2019

  1. gdk-pixbuf: 2.38.0 -> 2.38.1 

    https://gitlab.gnome.org/GNOME/gdk-pixbuf/tags/2.38.1
    @dtzWill
    dtzWill committed Feb 28, 2019
    Copy the full SHA
    9866979 View commit details

Commits on Mar 7, 2019

  1. Merge pull request #56547 from dtzWill/update/gdk-pixbuf-2.38.1 

    gdk-pixbuf: 2.38.0 -> 2.38.1
    @dtzWill
    dtzWill authored Mar 7, 2019
    Copy the full SHA
    19ccdd4 View commit details
Showing with 3 additions and 12 deletions.
  1. +3 −12 pkgs/development/libraries/gdk-pixbuf/default.nix
15 changes: 3 additions & 12 deletions pkgs/development/libraries/gdk-pixbuf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''