diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-23 17:58:56 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-23 18:16:34 +0100 |
| commit | 6581f53593ec22e362f3afe8418a58df23e05939 (patch) | |
| tree | 196fded4e3052a49c1a32c1b8a9d6f9d3a1de252 /pkgs/desktops | |
| parent | be1406eb792b79fa5c64efa6c1e11024d35bea78 (diff) | |
| download | nixlib-6581f53593ec22e362f3afe8418a58df23e05939.tar nixlib-6581f53593ec22e362f3afe8418a58df23e05939.tar.gz nixlib-6581f53593ec22e362f3afe8418a58df23e05939.tar.bz2 nixlib-6581f53593ec22e362f3afe8418a58df23e05939.tar.lz nixlib-6581f53593ec22e362f3afe8418a58df23e05939.tar.xz nixlib-6581f53593ec22e362f3afe8418a58df23e05939.tar.zst nixlib-6581f53593ec22e362f3afe8418a58df23e05939.zip | |
Revert "gnome-calculator: work around #17912, in a hacky way"
This reverts commit c2553952195cb390c9ae65e2a31ad02cc82d0f76.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix | 18 |
1 files changed, 1 insertions, 17 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 c31f23848cd4..e1b81339e91e 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,23 +1,7 @@ { 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; @@ -27,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib-hacked bash gtk3 glib intltool itstool + buildInputs = [ bash gtk3 glib intltool itstool libxml2 gnome3.gtksourceview mpfr gmp gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ]; |