From a502146d7adca79e716474bc979f0b0730ffd9f5 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 23 Sep 2020 09:49:37 +0300 Subject: [PATCH] gpxsee: 7.31 -> 7.32 --- pkgs/applications/misc/gpxsee/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 9ee3b96a5bbf..cc357917c850 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,28 +1,24 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qttranslations }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qttranslations, substituteAll }: mkDerivation rec { pname = "gpxsee"; - version = "7.31"; + version = "7.32"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0y60h66p8ydkinxk9x4sp4cm6gq66nc9jcavy135vmycsiq9gphn"; + sha256 = "0mcd6zv71laykg1208vkqmaxv1v12mqq47156gb78a5ww8paa0ka"; }; - patches = [ + patches = (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 - ./fix-qttranslations-path.diff - ]; + src = ./fix-qttranslations-path.diff; + inherit qttranslations; + }); nativeBuildInputs = [ qmake qttools ]; - postPatch = '' - substituteInPlace src/GUI/app.cpp \ - --subst-var-by qttranslations ${qttranslations} - ''; - preConfigure = '' lrelease gpxsee.pro '';