diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-23 18:13:51 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-23 18:16:34 +0100 |
| commit | c49f2a0854b33ea432371715129d3eb6b7bd7ff5 (patch) | |
| tree | e1bc04606b1e15a5bd8e48edab2e8a8e368ea504 | |
| parent | 6581f53593ec22e362f3afe8418a58df23e05939 (diff) | |
| download | nixlib-c49f2a0854b33ea432371715129d3eb6b7bd7ff5.tar nixlib-c49f2a0854b33ea432371715129d3eb6b7bd7ff5.tar.gz nixlib-c49f2a0854b33ea432371715129d3eb6b7bd7ff5.tar.bz2 nixlib-c49f2a0854b33ea432371715129d3eb6b7bd7ff5.tar.lz nixlib-c49f2a0854b33ea432371715129d3eb6b7bd7ff5.tar.xz nixlib-c49f2a0854b33ea432371715129d3eb6b7bd7ff5.tar.zst nixlib-c49f2a0854b33ea432371715129d3eb6b7bd7ff5.zip | |
gnome3.gnome-calculator: less hacky fix to #17912
Closes #17912
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix | 20 |
1 files changed, 20 insertions, 0 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 e1b81339e91e..23cdf41d5c0b 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 @@ -7,6 +7,26 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + # Fix for https://github.com/NixOS/nixpkgs/issues/17912 + # See also https://bugzilla.gnome.org/show_bug.cgi?id=673101 + # Should be removed when next release comes out + srcHistoryEntry = fetchurl { + url = "https://raw.githubusercontent.com/GNOME/gnome-calculator/9bb6936ba74602ec891c1ffecdf1665dba1a1be4/data/history-entry.ui"; + sha256 = "0a6d6anwrg5l3kc7i8jyky4idnzi9bhjv9awi6615505pjhcxnaj"; + }; + + srcHistoryView = fetchurl { + url = "https://raw.githubusercontent.com/GNOME/gnome-calculator/b87b4f5cd0cff0b9cf9e9cd2a056c56be653cab1/data/history-view.ui"; + sha256 = "0zyq1mcxsh707jhh3vfqplk5s83lb26gvjz62l5l6rq5yrd43fyw"; + }; + + prePatch = '' + [ -f data/history-entry.ui ] && echo Remove the fix && exit 1 + [ -f data/history-view.ui ] && echo Remove the fix && exit 1 + cp -v ${srcHistoryEntry} data/history-entry.ui + cp -v ${srcHistoryView} data/history-view.ui + ''; + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; |