mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
Merge pull request #225338 from Artturin/fixgsettingsisues1
This commit is contained in:
commit
b6382db930
@ -4,6 +4,7 @@
|
|||||||
, gettext
|
, gettext
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
, copyDesktopItems
|
, copyDesktopItems
|
||||||
|
, wrapGAppsHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
@ -16,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
sha256 = "sha256-qwH2mt3Va62QJKJGOpt5WV3QksqQaRGEif4CcPC5F2E=";
|
sha256 = "sha256-qwH2mt3Va62QJKJGOpt5WV3QksqQaRGEif4CcPC5F2E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ];
|
nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems wrapGAppsHook ];
|
||||||
|
|
||||||
pythonPath = with python3.pkgs; [
|
pythonPath = with python3.pkgs; [
|
||||||
wxPython_4_2
|
wxPython_4_2
|
||||||
@ -76,6 +77,12 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
runHook postCheck
|
runHook postCheck
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
dontWrapGApps = true;
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://thetimelineproj.sourceforge.net/";
|
homepage = "https://thetimelineproj.sourceforge.net/";
|
||||||
changelog = "https://thetimelineproj.sourceforge.net/changelog.html";
|
changelog = "https://thetimelineproj.sourceforge.net/changelog.html";
|
||||||
|
Loading…
Reference in New Issue
Block a user