uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,48 @@
{ lib, fetchzip, buildPythonApplication, python3Packages
, desktop-file-utils, freecell-solver }:
buildPythonApplication rec {
pname = "PySolFC";
version = "2.6.4";
src = fetchzip {
url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC/PySolFC-${version}/PySolFC-${version}.tar.xz";
sha256 = "1bd84law5b1yga3pryggdvlfvm0l62gci2q8y3q79cysdk3z4w3z";
};
cardsets = fetchzip {
url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2";
sha256 = "0h0fibjv47j8lkc1bwnlbbvrx2nr3l2hzv717kcgagwhc7v2mrqh";
};
propagatedBuildInputs = with python3Packages; [
tkinter six random2
# optional :
pygame freecell-solver pillow
];
patches = [
./pysolfc-datadir.patch
];
nativeBuildInputs = [ desktop-file-utils ];
postPatch = ''
desktop-file-edit --set-key Icon --set-value ${placeholder "out"}/share/icons/pysol01.png data/pysol.desktop
desktop-file-edit --set-key Comment --set-value "${meta.description}" data/pysol.desktop
'';
postInstall = ''
mkdir $out/share/PySolFC/cardsets
cp -r $cardsets/* $out/share/PySolFC/cardsets
'';
# No tests in archive
doCheck = false;
meta = with lib; {
description = "A collection of more than 1000 solitaire card games";
homepage = "https://pysolfc.sourceforge.io";
license = licenses.gpl3;
maintainers = with maintainers; [ kierdavis ];
};
}

View file

@ -0,0 +1,19 @@
diff --git a/pysollib/util.py b/pysollib/util.py
index 8de3f00..26f4bc7 100644
--- a/pysollib/util.py
+++ b/pysollib/util.py
@@ -110,13 +110,7 @@ class DataLoader:
head, tail = os.path.split(argv0)
if not head:
head = os.curdir
- # dir where placed startup script
- path.append(head)
- path.append(os.path.join(head, "data"))
- path.append(os.path.join(head, os.pardir, "data"))
- # dir where placed pysol package
- path.append(os.path.join(sys.path[0], "data"))
- path.append(os.path.join(sys.path[0], "pysollib", "data"))
+ path.append(os.path.join(head, "..", "share", "PySolFC"))
# from settings.py
path.extend(DATA_DIRS)
# check path for valid directories