treewide: remove issue #56943 workarounds
checked with diffoscope+difflog and launching the programs i have fixed that issue in my other gir PRs
This commit is contained in:
parent
fa169bb239
commit
cadffcfe50
|
@ -116,10 +116,6 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti
|
||||||
|
|
||||||
- []{#ssec-gnome-hooks-gobject-introspection} `gobject-introspection` setup hook populates `GI_TYPELIB_PATH` variable with `lib/girepository-1.0` directories of dependencies, which is then added to wrapper by `wrapGAppsHook`. It also adds `share` directories of dependencies to `XDG_DATA_DIRS`, which is intended to promote GIR files but it also [pollutes the closures](https://github.com/NixOS/nixpkgs/issues/32790) of packages using `wrapGAppsHook`.
|
- []{#ssec-gnome-hooks-gobject-introspection} `gobject-introspection` setup hook populates `GI_TYPELIB_PATH` variable with `lib/girepository-1.0` directories of dependencies, which is then added to wrapper by `wrapGAppsHook`. It also adds `share` directories of dependencies to `XDG_DATA_DIRS`, which is intended to promote GIR files but it also [pollutes the closures](https://github.com/NixOS/nixpkgs/issues/32790) of packages using `wrapGAppsHook`.
|
||||||
|
|
||||||
::: {.warning}
|
|
||||||
The setup hook [currently](https://github.com/NixOS/nixpkgs/issues/56943) does not work in expressions with `strictDeps` enabled, like Python packages. In those cases, you will need to disable it with `strictDeps = false;`.
|
|
||||||
:::
|
|
||||||
|
|
||||||
- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`.
|
- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`.
|
||||||
|
|
||||||
You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook:
|
You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook:
|
||||||
|
|
|
@ -31,13 +31,13 @@ python3Packages.buildPythonApplication rec {
|
||||||
pkg-config
|
pkg-config
|
||||||
wrapGAppsHook4
|
wrapGAppsHook4
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
|
gobject-introspection
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib
|
glib
|
||||||
gtk4
|
gtk4
|
||||||
libadwaita
|
libadwaita
|
||||||
gobject-introspection
|
|
||||||
gst_all_1.gstreamer
|
gst_all_1.gstreamer
|
||||||
gst_all_1.gst-plugins-base
|
gst_all_1.gst-plugins-base
|
||||||
gst_all_1.gst-plugins-good
|
gst_all_1.gst-plugins-good
|
||||||
|
@ -48,9 +48,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
pygobject3
|
pygobject3
|
||||||
];
|
];
|
||||||
|
|
||||||
# Broken with gobject-introspection setup hook
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -24,11 +24,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
pname = "cozy";
|
pname = "cozy";
|
||||||
version = "1.2.1";
|
version = "1.2.1";
|
||||||
|
|
||||||
# Temporary fix
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/57029
|
|
||||||
# and https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "geigi";
|
owner = "geigi";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
|
|
|
@ -27,17 +27,12 @@ python3Packages.buildPythonApplication rec {
|
||||||
intltool
|
intltool
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
glibcLocales
|
glibcLocales
|
||||||
|
gobject-introspection
|
||||||
];
|
];
|
||||||
|
|
||||||
# as of 2021-07, the gobject-introspection setup hook does not
|
|
||||||
# work with `strictDeps` enabled, thus for proper `wrapGAppsHook`
|
|
||||||
# it needs to be disabled explicitly. https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
python3
|
python3
|
||||||
gtk3
|
gtk3
|
||||||
gobject-introspection
|
|
||||||
gnome.adwaita-icon-theme
|
gnome.adwaita-icon-theme
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -39,10 +39,6 @@ in buildPythonApplication rec {
|
||||||
setuptools
|
setuptools
|
||||||
];
|
];
|
||||||
|
|
||||||
# Otherwise the setup hook for gobject-introspection is not run:
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# Remove "Local MPD" tab which is not suitable for NixOS.
|
# Remove "Local MPD" tab which is not suitable for NixOS.
|
||||||
sed -i '/localmpd/d' sonata/consts.py
|
sed -i '/localmpd/d' sonata/consts.py
|
||||||
|
|
|
@ -75,10 +75,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
++ lib.optional serverSupport bottle
|
++ lib.optional serverSupport bottle
|
||||||
;
|
;
|
||||||
|
|
||||||
# hook for gobject-introspection doesn't like strictDeps
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
nativeCheckInputs = with python3Packages; [
|
nativeCheckInputs = with python3Packages; [
|
||||||
pytest
|
pytest
|
||||||
];
|
];
|
||||||
|
|
|
@ -30,10 +30,6 @@ buildPythonApplication rec {
|
||||||
"--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
"--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||||
];
|
];
|
||||||
|
|
||||||
# Until gobject-introspection in nativeBuildInputs is supported.
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-472568643
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://rednotebook.sourceforge.io/";
|
homepage = "https://rednotebook.sourceforge.io/";
|
||||||
changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md";
|
changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md";
|
||||||
|
|
|
@ -37,18 +37,16 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
|
gobject-introspection
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
appstream-glib
|
appstream-glib
|
||||||
python3.pkgs.pygobject3
|
python3.pkgs.pygobject3
|
||||||
gobject-introspection
|
|
||||||
gettext
|
gettext
|
||||||
|
gtk3
|
||||||
];
|
];
|
||||||
|
|
||||||
# Currently still required for the gobject-introspection setup hook
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
patchShebangs ../build-aux/meson/postinstall.py
|
patchShebangs ../build-aux/meson/postinstall.py
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -25,17 +25,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
hash = "sha256-Nok4oqTezO84q9IDZvgi33ZeKfRL+tpg7QEDmp2ZZpU=";
|
hash = "sha256-Nok4oqTezO84q9IDZvgi33ZeKfRL+tpg7QEDmp2ZZpU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ];
|
buildInputs = [ gtk3 gdk-pixbuf ];
|
||||||
nativeBuildInputs = [ wrapGAppsHook ];
|
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
||||||
propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]);
|
propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]);
|
||||||
|
|
||||||
# Tests are broken
|
# Tests are broken
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
# Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
# until https://github.com/NixOS/nixpkgs/pull/102613
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
# prevent double wrapping
|
# prevent double wrapping
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
||||||
|
|
|
@ -37,10 +37,6 @@ buildPythonPackage rec {
|
||||||
gtk3
|
gtk3
|
||||||
];
|
];
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
# this must be false, otherwise the gobject-introspection hook doesn't run
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
preDistPhases = [ "fixupIconPath" ];
|
preDistPhases = [ "fixupIconPath" ];
|
||||||
|
|
||||||
fixupIconPath = ''
|
fixupIconPath = ''
|
||||||
|
|
|
@ -18,7 +18,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
pname = "gnome-secrets";
|
pname = "gnome-secrets";
|
||||||
version = "7.2";
|
version = "7.2";
|
||||||
format = "other";
|
format = "other";
|
||||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.gnome.org";
|
domain = "gitlab.gnome.org";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool
|
{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3
|
||||||
, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }:
|
, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
|
@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
pango
|
pango
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
atk
|
atk
|
||||||
|
gtk3
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python3Packages; [
|
||||||
|
@ -37,10 +38,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
dbus-python
|
dbus-python
|
||||||
];
|
];
|
||||||
|
|
||||||
# Setup hooks have trouble with strict deps.
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
||||||
# Arguments to be passed to `makeWrapper`, only used by buildPython*
|
# Arguments to be passed to `makeWrapper`, only used by buildPython*
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
, shared-mime-info
|
, shared-mime-info
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, wafHook
|
, wafHook
|
||||||
|
, bash
|
||||||
|
, dbus
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with python3Packages;
|
with python3Packages;
|
||||||
|
@ -33,14 +35,12 @@ buildPythonApplication rec {
|
||||||
itstool # for help pages
|
itstool # for help pages
|
||||||
desktop-file-utils # for update-desktop-database
|
desktop-file-utils # for update-desktop-database
|
||||||
shared-mime-info # for update-mime-info
|
shared-mime-info # for update-mime-info
|
||||||
|
docutils # for rst2man
|
||||||
|
dbus # for detection of dbus-send during build
|
||||||
];
|
];
|
||||||
buildInputs = [ docutils libwnck keybinder3 ];
|
buildInputs = [ libwnck keybinder3 bash ];
|
||||||
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
|
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
|
||||||
|
|
||||||
# without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk'
|
|
||||||
# see https://github.com/NixOS/nixpkgs/issues/56943 for details
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
gappsWrapperArgs+=(
|
gappsWrapperArgs+=(
|
||||||
"--prefix" "PYTHONPATH" : "${makePythonPath propagatedBuildInputs}"
|
"--prefix" "PYTHONPATH" : "${makePythonPath propagatedBuildInputs}"
|
||||||
|
|
|
@ -84,13 +84,12 @@ buildPythonApplication rec {
|
||||||
sha256 = "sha256-rsiXm7L/M85ot6NrTyy//lMRFlLPJYve9y6Erg9Ugxg=";
|
sha256 = "sha256-rsiXm7L/M85ot6NrTyy//lMRFlLPJYve9y6Erg9Ugxg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ wrapGAppsHook ];
|
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
atk
|
atk
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
glib-networking
|
glib-networking
|
||||||
gnome-desktop
|
gnome-desktop
|
||||||
gobject-introspection
|
|
||||||
gtk3
|
gtk3
|
||||||
libnotify
|
libnotify
|
||||||
pango
|
pango
|
||||||
|
@ -139,9 +138,6 @@ buildPythonApplication rec {
|
||||||
"--prefix PATH : ${lib.makeBinPath requiredTools}"
|
"--prefix PATH : ${lib.makeBinPath requiredTools}"
|
||||||
"\${gappsWrapperArgs[@]}"
|
"\${gappsWrapperArgs[@]}"
|
||||||
];
|
];
|
||||||
# needed for glib-schemas to work correctly (will crash on dialogues otherwise)
|
|
||||||
# see https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://lutris.net";
|
homepage = "https://lutris.net";
|
||||||
|
|
|
@ -31,18 +31,14 @@ python3Packages.buildPythonApplication rec {
|
||||||
runHook postCheck
|
runHook postCheck
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Cannot find GSettings schemas when opening settings,
|
|
||||||
# probably https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gettext
|
gettext
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
|
gobject-introspection
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib-networking
|
glib-networking
|
||||||
gobject-introspection
|
|
||||||
gtk3
|
gtk3
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -64,6 +60,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
# Run Linux games using the Steam Runtime by using steam-run in the wrapper
|
# Run Linux games using the Steam Runtime by using steam-run in the wrapper
|
||||||
|
# FIXME: not working with makeBinaryWrapper
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy
|
sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -108,9 +108,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
python3.pkgs.nose
|
python3.pkgs.nose
|
||||||
];
|
];
|
||||||
|
|
||||||
# Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
|
|
|
@ -32,8 +32,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||||
|
|
|
@ -12,7 +12,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "wike";
|
pname = "wike";
|
||||||
version = "1.7.1";
|
version = "1.7.1";
|
||||||
format = "other";
|
format = "other";
|
||||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hugolabe";
|
owner = "hugolabe";
|
||||||
|
|
|
@ -66,9 +66,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
requests
|
requests
|
||||||
];
|
];
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
|
|
|
@ -64,9 +64,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A Reddit app, built with Python, GTK and Handy; Created with mobile Linux in mind";
|
description = "A Reddit app, built with Python, GTK and Handy; Created with mobile Linux in mind";
|
||||||
maintainers = with maintainers; [ dasj19 ];
|
maintainers = with maintainers; [ dasj19 ];
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
, glib
|
, glib
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, folks
|
, folks
|
||||||
|
, bash
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
|
@ -39,6 +40,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
libsecret
|
libsecret
|
||||||
gnome-online-accounts
|
gnome-online-accounts
|
||||||
folks
|
folks
|
||||||
|
bash
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -59,9 +61,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
# See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped
|
# See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -41,8 +41,6 @@ buildPythonApplication rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
# To avoid enabling strictDeps = false (#56943)
|
|
||||||
gobject-introspection
|
|
||||||
librsvg
|
librsvg
|
||||||
pango
|
pango
|
||||||
webkitgtk
|
webkitgtk
|
||||||
|
|
|
@ -67,7 +67,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
format = "other";
|
format = "other";
|
||||||
strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943)
|
|
||||||
|
|
||||||
checkPhase = "xvfb-run pytest ../tests/";
|
checkPhase = "xvfb-run pytest ../tests/";
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,8 @@ python3Packages.buildPythonApplication rec {
|
||||||
sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U=";
|
sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ gtk3 gobject-introspection gnome.adwaita-icon-theme ];
|
buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
|
||||||
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
|
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
|
||||||
# see https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663
|
|
||||||
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
|
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
|
||||||
|
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
|
@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
pname = "bada-bib";
|
pname = "bada-bib";
|
||||||
version = "0.8.0";
|
version = "0.8.0";
|
||||||
format = "other";
|
format = "other";
|
||||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "RogerCrocker";
|
owner = "RogerCrocker";
|
||||||
|
|
|
@ -26,11 +26,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU=";
|
sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Strict deps breaks guake
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/59930
|
|
||||||
# and https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
|
|
|
@ -52,10 +52,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
pycairo
|
pycairo
|
||||||
];
|
];
|
||||||
|
|
||||||
# gobject-introspection and some other similar setup hooks do not currently work with strictDeps.
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs meson_shebang_normalisation.py
|
patchShebangs meson_shebang_normalisation.py
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -15,17 +15,8 @@ in buildPythonApplication rec {
|
||||||
sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg";
|
sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Temporary fix
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/61578
|
|
||||||
# and https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gettext wrapGAppsHook
|
gettext wrapGAppsHook
|
||||||
|
|
||||||
# Temporary fix
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/61578
|
|
||||||
# and https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -40,9 +40,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [ pygobject3 pyxdg pycairo dbus-python xlib ];
|
propagatedBuildInputs = with python3Packages; [ pygobject3 pyxdg pycairo dbus-python xlib ];
|
||||||
|
|
||||||
# workaround https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Fix paths
|
# Fix paths
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
|
|
|
@ -44,10 +44,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
itstool
|
itstool
|
||||||
python3
|
python3
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
|
gobject-introspection
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gobject-introspection
|
|
||||||
gtk3
|
gtk3
|
||||||
libpeas
|
libpeas
|
||||||
librsvg
|
librsvg
|
||||||
|
@ -78,12 +78,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
patchShebangs ./getenvvar.py
|
patchShebangs ./getenvvar.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Fixes error
|
|
||||||
# Couldn’t recognize the image file format for file ".../share/pitivi/pixmaps/asset-proxied.svg"
|
|
||||||
# at startup, see https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
# and https://github.com/NixOS/nixpkgs/issues/89691#issuecomment-714398705.
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = gnome.updateScript {
|
updateScript = gnome.updateScript {
|
||||||
packageName = "pitivi";
|
packageName = "pitivi";
|
||||||
|
|
|
@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi
|
libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi
|
||||||
gsettings-desktop-schemas libosinfo gtksourceview4
|
gsettings-desktop-schemas libosinfo gtksourceview4
|
||||||
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
] ++ lib.optional spiceSupport spice-gtk;
|
] ++ lib.optional spiceSupport spice-gtk;
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
, gettext
|
, gettext
|
||||||
, libwnck
|
, libwnck
|
||||||
, adwaita-icon-theme
|
, adwaita-icon-theme
|
||||||
|
, librsvg
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
|
@ -41,6 +42,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
at-spi2-core
|
at-spi2-core
|
||||||
gtk3
|
gtk3
|
||||||
libwnck
|
libwnck
|
||||||
|
librsvg
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
|
@ -52,10 +54,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
xlib
|
xlib
|
||||||
];
|
];
|
||||||
|
|
||||||
# Strict deps breaks accerciser
|
|
||||||
# and https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = gnome.updateScript {
|
updateScript = gnome.updateScript {
|
||||||
packageName = "accerciser";
|
packageName = "accerciser";
|
||||||
|
|
|
@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
pname = "gnome-tweaks";
|
pname = "gnome-tweaks";
|
||||||
version = "42.beta";
|
version = "42.beta";
|
||||||
format = "other";
|
format = "other";
|
||||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||||
|
|
|
@ -41,7 +41,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
python3Packages.pyxdg
|
python3Packages.pyxdg
|
||||||
python3Packages.ptyprocess
|
python3Packages.ptyprocess
|
||||||
python3Packages.pycairo
|
python3Packages.pycairo
|
||||||
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -57,15 +57,16 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
libhandy
|
libhandy
|
||||||
];
|
];
|
||||||
|
|
||||||
# Not compatible with gobject-introspection setup hooks.
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
# Prevent double wrapping.
|
# Prevent double wrapping.
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs postinstall.py
|
patchShebangs postinstall.py
|
||||||
|
# those programs are used at runtime not build time
|
||||||
|
# https://gitlab.gnome.org/jpu/cambalache/-/blob/main/meson.build#L79-80
|
||||||
|
substituteInPlace ./meson.build \
|
||||||
|
--replace "find_program('broadwayd', required: true)" "" \
|
||||||
|
--replace "find_program('gtk4-broadwayd', required: true)" ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
|
|
|
@ -63,10 +63,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
"-Dtests=false" # needs dbus
|
"-Dtests=false" # needs dbus
|
||||||
];
|
];
|
||||||
|
|
||||||
# Temporary fix
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
chmod +x meson_post_install.py
|
chmod +x meson_post_install.py
|
||||||
patchShebangs meson_post_install.py
|
patchShebangs meson_post_install.py
|
||||||
|
|
|
@ -18,12 +18,9 @@ buildPythonApplication rec {
|
||||||
sha256 = "sha256-ym5fkOTRhibBaUqT0+p/jyqqKOVsyMz5INgfkoz0IJA=";
|
sha256 = "sha256-ym5fkOTRhibBaUqT0+p/jyqqKOVsyMz5INgfkoz0IJA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# see https://github.com/NixOS/nixpkgs/issues/56943
|
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ wrapGAppsHook ];
|
buildInputs = [ gtk3 libappindicator-gtk3 librsvg ];
|
||||||
|
|
||||||
buildInputs = [ gtk3 gobject-introspection libappindicator-gtk3 librsvg ];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ evdev pygobject3 pylibacl vdf ];
|
propagatedBuildInputs = [ evdev pygobject3 pylibacl vdf ];
|
||||||
|
|
||||||
|
|
|
@ -35,13 +35,11 @@ buildPythonApplication rec {
|
||||||
texinfo
|
texinfo
|
||||||
txt2man
|
txt2man
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663
|
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gobject-introspection
|
|
||||||
gtk3
|
gtk3
|
||||||
librsvg
|
librsvg
|
||||||
];
|
];
|
||||||
|
|
|
@ -19,9 +19,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gtk3 glib gnome.adwaita-icon-theme python3 librsvg
|
gtk3 glib gnome.adwaita-icon-theme python3 librsvg
|
||||||
];
|
];
|
||||||
propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [
|
propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];
|
||||||
gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now
|
|
||||||
];
|
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Druntime-dependency-checks=false"
|
"-Druntime-dependency-checks=false"
|
||||||
|
|
|
@ -27,10 +27,6 @@ buildPythonApplication rec {
|
||||||
# no tests
|
# no tests
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
# hook for gobject-introspection doesn't like strictDeps
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
buildInputs = [ docutils gsettings-desktop-schemas gtk3 ];
|
buildInputs = [ docutils gsettings-desktop-schemas gtk3 ];
|
||||||
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
|
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
|
||||||
propagatedBuildInputs = [ xrandr pygobject3 ];
|
propagatedBuildInputs = [ xrandr pygobject3 ];
|
||||||
|
|
|
@ -61,7 +61,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python3Packages; [
|
||||||
confuse
|
confuse
|
||||||
gobject-introspection
|
|
||||||
gst-python
|
gst-python
|
||||||
jellyfish
|
jellyfish
|
||||||
mediafile
|
mediafile
|
||||||
|
@ -74,7 +73,6 @@ python3Packages.buildPythonApplication rec {
|
||||||
unidecode
|
unidecode
|
||||||
] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins));
|
] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins));
|
||||||
|
|
||||||
# see: https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
sphinxHook
|
sphinxHook
|
||||||
|
|
|
@ -13,7 +13,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "mpDris2";
|
pname = "mpDris2";
|
||||||
version = "0.9.1";
|
version = "0.9.1";
|
||||||
format = "other";
|
format = "other";
|
||||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "eonpatapon";
|
owner = "eonpatapon";
|
||||||
|
|
|
@ -45,11 +45,6 @@ in
|
||||||
hash = "sha256-KPQLgXSonuOgphagYN2JN+CMIpmjTIPUTCqOPDk0UYU=";
|
hash = "sha256-KPQLgXSonuOgphagYN2JN+CMIpmjTIPUTCqOPDk0UYU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Fixes error
|
|
||||||
# Couldn’t recognize the image file format for file "*.svg"
|
|
||||||
# at startup, see https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# fix FHS paths
|
# fix FHS paths
|
||||||
substituteInPlace inputremapper/configs/data.py \
|
substituteInPlace inputremapper/configs/data.py \
|
||||||
|
|
|
@ -37,11 +37,7 @@ buildPythonApplication rec {
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
# Setting gobject-introspection on booth nativeBuildInputs and
|
|
||||||
# buildInputs because of #56943. This recognizes pango, avoiding
|
|
||||||
# a "ValueError: Namespace PangoCairo not available".
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gobject-introspection
|
|
||||||
gtksourceview4
|
gtksourceview4
|
||||||
pango
|
pango
|
||||||
];
|
];
|
||||||
|
|
|
@ -35,10 +35,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ copyDesktopItems ]
|
nativeBuildInputs = [ copyDesktopItems ]
|
||||||
++ lib.optionals withGTK [ wrapGAppsHook ]
|
++ lib.optionals withGTK [ wrapGAppsHook gobject-introspection ]
|
||||||
++ lib.optionals withQT [ qt5.wrapQtAppsHook ];
|
++ lib.optionals withQT [ qt5.wrapQtAppsHook ];
|
||||||
|
|
||||||
buildInputs = lib.optionals withGTK [ glib gobject-introspection gtk3 ];
|
buildInputs = lib.optionals withGTK [ glib gtk3 ];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; ([ urllib3 ]
|
propagatedBuildInputs = with python3.pkgs; ([ urllib3 ]
|
||||||
++ lib.optionals withQT [ pyqt5 ]
|
++ lib.optionals withQT [ pyqt5 ]
|
||||||
|
@ -47,9 +47,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
++ lib.optionals stdenv.isLinux [ dbus-python pygobject3 pyinotify ]
|
++ lib.optionals stdenv.isLinux [ dbus-python pygobject3 pyinotify ]
|
||||||
++ lib.optionals (withGTK || withQT) [ pillow ]);
|
++ lib.optionals (withGTK || withQT) [ pillow ]);
|
||||||
|
|
||||||
# broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
||||||
|
|
|
@ -67,9 +67,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
twisted
|
twisted
|
||||||
];
|
];
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
# bunch of linting
|
# bunch of linting
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -22,10 +22,6 @@ buildPythonApplication rec {
|
||||||
substituteInPlace setup.py --replace /usr/share share
|
substituteInPlace setup.py --replace /usr/share share
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Temporary fix
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/56943
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
Loading…
Reference in New Issue
Block a user