diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-22 23:47:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-22 23:49:41 +0200 |
| commit | c2553952195cb390c9ae65e2a31ad02cc82d0f76 (patch) | |
| tree | d266d39674abb60e263a48e0c02f0419d5dea0b6 /pkgs/desktops/gnome-3/3.20/core | |
| parent | d3705faa560c9831bcc27ffebb1eaaca291c64f0 (diff) | |
| download | nixpkgs-c2553952195cb390c9ae65e2a31ad02cc82d0f76.tar nixpkgs-c2553952195cb390c9ae65e2a31ad02cc82d0f76.tar.gz nixpkgs-c2553952195cb390c9ae65e2a31ad02cc82d0f76.tar.bz2 nixpkgs-c2553952195cb390c9ae65e2a31ad02cc82d0f76.tar.lz nixpkgs-c2553952195cb390c9ae65e2a31ad02cc82d0f76.tar.xz nixpkgs-c2553952195cb390c9ae65e2a31ad02cc82d0f76.tar.zst nixpkgs-c2553952195cb390c9ae65e2a31ad02cc82d0f76.zip | |
gnome-calculator: work around #17912, in a hacky way
Diffstat (limited to 'pkgs/desktops/gnome-3/3.20/core')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix index e1b81339e91..c31f23848cd 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix @@ -1,7 +1,23 @@ { stdenv, intltool, fetchurl, pkgconfig, libxml2 , bash, gtk3, glib, wrapGAppsHook +, autoreconfHook , itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }: +let + # work-around for https://github.com/NixOS/nixpkgs/issues/17912 + glib-hacked = (glib.overrideDerivation (attrs: { + postPatch = attrs.postPatch or "" + '' + cat '${rPatch}' | sed '/^---.*gitignore/,/^---/d' | patch -R -p1 + ''; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; + })).dev; # we need just bin/glib-compile-resources; everything else should be the same + rPatch = fetchurl { + name = "glib-resources.patch"; + url = "https://bug673101.bugzilla-attachments.gnome.org/attachment.cgi?" + + "id=329105&action=diff&collapsed=&context=patch&format=raw&headers=1"; + sha256 = "051d7l1wx9sp5wcnv7yk6mbn3akac1m06sp3jl3hqapx74bkmai0"; + }; +in stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -11,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ bash gtk3 glib intltool itstool + buildInputs = [ glib-hacked bash gtk3 glib intltool itstool libxml2 gnome3.gtksourceview mpfr gmp gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ]; |