pyrox.dev
gnome-calculator: work around #17912, in a hacky way
+17
-1
pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
+17
-1
pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
···
1
{ stdenv, intltool, fetchurl, pkgconfig, libxml2
2
, bash, gtk3, glib, wrapGAppsHook
3
, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }:
4
5
stdenv.mkDerivation rec {
6
inherit (import ./src.nix fetchurl) name src;
7
···
11
12
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
13
14
-
buildInputs = [ bash gtk3 glib intltool itstool
15
libxml2 gnome3.gtksourceview mpfr gmp
16
gdk_pixbuf gnome3.defaultIconTheme librsvg
17
gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ];
···
1
{ stdenv, intltool, fetchurl, pkgconfig, libxml2
2
, bash, gtk3, glib, wrapGAppsHook
3
+
, autoreconfHook
4
, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }:
5
6
+
let
7
+
# work-around for https://github.com/NixOS/nixpkgs/issues/17912
8
+
glib-hacked = (glib.overrideDerivation (attrs: {
9
+
postPatch = attrs.postPatch or "" + ''
10
+
cat '${rPatch}' | sed '/^---.*gitignore/,/^---/d' | patch -R -p1
11
+
'';
12
+
nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];
13
+
})).dev; # we need just bin/glib-compile-resources; everything else should be the same
14
+
rPatch = fetchurl {
15
+
name = "glib-resources.patch";
16
+
url = "https://bug673101.bugzilla-attachments.gnome.org/attachment.cgi?"
17
+
+ "id=329105&action=diff&collapsed=&context=patch&format=raw&headers=1";
18
+
sha256 = "051d7l1wx9sp5wcnv7yk6mbn3akac1m06sp3jl3hqapx74bkmai0";
19
+
};
20
+
in
21
stdenv.mkDerivation rec {
22
inherit (import ./src.nix fetchurl) name src;
23
···
27
28
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
29
30
+
buildInputs = [ glib-hacked bash gtk3 glib intltool itstool
31
libxml2 gnome3.gtksourceview mpfr gmp
32
gdk_pixbuf gnome3.defaultIconTheme librsvg
33
gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ];