Refactor Nix package definitions for webcomix, colordle, dosage, protonup-qt, qbit-manage, and steam by removing unused variables, improving formatting, and ensuring consistency in dependency handling. Notable changes include the removal of unnecessary checks and whitespace adjustments.
This commit is contained in:
@@ -39,11 +39,11 @@ buildPythonApplication rec {
|
|||||||
click
|
click
|
||||||
tqdm
|
tqdm
|
||||||
scrapy
|
scrapy
|
||||||
(scrapy-splash.overridePythonAttrs (oldAttrs: {
|
(scrapy-splash.overridePythonAttrs (_oldAttrs: {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
nativeCheckInputs = [ ];
|
nativeCheckInputs = [ ];
|
||||||
}))
|
}))
|
||||||
(scrapy-fake-useragent.overridePythonAttrs (oldAttrs: {
|
(scrapy-fake-useragent.overridePythonAttrs (_oldAttrs: {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
nativeCheckInputs = [ ];
|
nativeCheckInputs = [ ];
|
||||||
checkPhase = "";
|
checkPhase = "";
|
||||||
@@ -58,7 +58,7 @@ buildPythonApplication rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
# Skip runtime dependency check due to version mismatches with nixpkgs
|
# Skip runtime dependency check due to version mismatches with nixpkgs
|
||||||
dontCheckRuntimeDeps = true;
|
dontCheckRuntimeDeps = true;
|
||||||
|
|
||||||
|
|||||||
@@ -28,27 +28,36 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
gtk4
|
gtk4
|
||||||
libadwaita
|
libadwaita
|
||||||
(python3.withPackages (ps: with ps; [
|
(python3.withPackages (
|
||||||
pygobject3
|
ps: with ps; [
|
||||||
pycairo
|
pygobject3
|
||||||
]))
|
pycairo
|
||||||
|
]
|
||||||
|
))
|
||||||
];
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
mkdir -p $out/bin $out/share/hexcolordle-gtk $out/share/applications $out/share/metainfo
|
mkdir -p $out/bin $out/share/hexcolordle-gtk $out/share/applications $out/share/metainfo
|
||||||
cp -r * $out/share/hexcolordle-gtk/
|
cp -r * $out/share/hexcolordle-gtk/
|
||||||
|
|
||||||
# Install desktop file and metainfo
|
# Install desktop file and metainfo
|
||||||
cp net.krafting.HexColordle.desktop $out/share/applications/
|
cp net.krafting.HexColordle.desktop $out/share/applications/
|
||||||
cp net.krafting.HexColordle.metainfo.xml $out/share/metainfo/
|
cp net.krafting.HexColordle.metainfo.xml $out/share/metainfo/
|
||||||
|
|
||||||
# Create wrapper for the main Python file
|
# Create wrapper for the main Python file
|
||||||
makeWrapper ${python3.withPackages (ps: with ps; [pygobject3 pycairo])}/bin/python3 $out/bin/hexcolordle-gtk \
|
makeWrapper ${
|
||||||
|
python3.withPackages (
|
||||||
|
ps: with ps; [
|
||||||
|
pygobject3
|
||||||
|
pycairo
|
||||||
|
]
|
||||||
|
)
|
||||||
|
}/bin/python3 $out/bin/hexcolordle-gtk \
|
||||||
--add-flags "$out/share/hexcolordle-gtk/HexColordle.py" \
|
--add-flags "$out/share/hexcolordle-gtk/HexColordle.py" \
|
||||||
--prefix PYTHONPATH : "$out/share/hexcolordle-gtk"
|
--prefix PYTHONPATH : "$out/share/hexcolordle-gtk"
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
gtk4,
|
gtk4,
|
||||||
libadwaita,
|
libadwaita,
|
||||||
wrapGAppsHook4,
|
wrapGAppsHook4,
|
||||||
makeWrapper,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ buildPythonApplication rec {
|
|||||||
pythonRemoveDeps = [
|
pythonRemoveDeps = [
|
||||||
"pyside6-essentials"
|
"pyside6-essentials"
|
||||||
];
|
];
|
||||||
|
|
||||||
# Skip runtime dependency check for missing packages
|
# Skip runtime dependency check for missing packages
|
||||||
dontCheckRuntimeDeps = true;
|
dontCheckRuntimeDeps = true;
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ buildPythonApplication rec {
|
|||||||
slowapi
|
slowapi
|
||||||
uvicorn
|
uvicorn
|
||||||
];
|
];
|
||||||
|
|
||||||
# Skip runtime dependency check due to version mismatches with nixpkgs
|
# Skip runtime dependency check due to version mismatches with nixpkgs
|
||||||
dontCheckRuntimeDeps = true;
|
dontCheckRuntimeDeps = true;
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
lib,
|
lib,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
callPackage,
|
|
||||||
setuptools,
|
setuptools,
|
||||||
wheel,
|
wheel,
|
||||||
six,
|
six,
|
||||||
|
|||||||
Reference in New Issue
Block a user