gnome-calculator: work around #17912, in a hacky way
This commit is contained in:
parent
d3705faa56
commit
c255395219
@ -1,7 +1,23 @@
|
|||||||
{ 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;
|
||||||
|
|
||||||
@ -11,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
|
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
|
||||||
|
|
||||||
buildInputs = [ bash gtk3 glib intltool itstool
|
buildInputs = [ glib-hacked 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 ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user