public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "gnome-calculator: work around #17912, in a hacky way"

Browse Source 
This reverts commit c2553952195cb390c9ae65e2a31ad02cc82d0f76.
This commit is contained in:
obadz 2016-08-23 17:58:56 +01:00
parent be1406eb79
commit 6581f53593
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
View File

@ -1,23 +1,7 @@
{ stdenv, intltool, fetchurl, pkgconfig, libxml2 { stdenv, intltool, fetchurl, pkgconfig, libxml2
, bash, gtk3, glib, wrapGAppsHook , bash, gtk3, glib, wrapGAppsHook
, autoreconfHook
, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }: , 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 { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
@ -27,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ glib-hacked bash gtk3 glib intltool itstool buildInputs = [ bash gtk3 glib intltool itstool
libxml2 gnome3.gtksourceview mpfr gmp libxml2 gnome3.gtksourceview mpfr gmp
gdk_pixbuf gnome3.defaultIconTheme librsvg gdk_pixbuf gnome3.defaultIconTheme librsvg
gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ]; gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ];