git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #103650 from orivej/sc-controller

sc-controller: unbreak by restoring pygobject3 and pylibacl for python2

commit486ddeb7ee53c87a7bf5b5a38cbe382b1dc523ef authorOrivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> dateMon 7 Dec 2020, 00:11 (6 years ago) parent02dabab35e26f9
4 files changed+74−3
pkgs/development/python-modules/pygobject/3.36.nix+40 pkgs/development/python-modules/pylibacl/0.5.nix+26 pkgs/misc/drivers/sc-controller/default.nix−1 pkgs/top-level/python-packages.nix+8−2
pkgs/development/python-modules/pygobject/3.36.nixnew file+40
@@ -0,0 +1,40 @@
1+{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection,
2+pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
3+
4+buildPythonPackage rec {
5+ pname = "pygobject";
6+ version = "3.36.1";
7+
8+ format = "other";
9+
10+ src = fetchurl {
11+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12+ sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8=";
13+ };
14+
15+ outputs = [ "out" "dev" ];
16+
17+ mesonFlags = [
18+ "-Dpython=python${if isPy3k then "3" else "2" }"
19+ ];
20+
21+ nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
22+ buildInputs = [ glib gobject-introspection ]
23+ ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
24+ propagatedBuildInputs = [ pycairo cairo ];
25+
26+ passthru = {
27+ updateScript = gnome3.updateScript {
28+ packageName = pname;
29+ attrPath = "python3.pkgs.${pname}3";
30+ };
31+ };
32+
33+ meta = with stdenv.lib; {
34+ homepage = "https://pygobject.readthedocs.io/";
35+ description = "Python bindings for Glib";
36+ license = licenses.gpl2;
37+ maintainers = with maintainers; [ orivej ];
38+ platforms = platforms.unix;
39+ };
40+}
pkgs/development/python-modules/pylibacl/0.5.nixnew file+26
@@ -0,0 +1,26 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, pkgs
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "pylibacl";
9+ version = "0.5.4";
10+
11+ src = fetchPypi {
12+ inherit pname version;
13+ sha256 = "0drvxb21y7p0aikcv3jx90vdcjk96kibf9x8qgxic2prxxd3f3q6";
14+ };
15+
16+ # ERROR: testExtended (tests.test_acls.AclExtensions)
17+ # IOError: [Errno 0] Error
18+ doCheck = false;
19+
20+ buildInputs = with pkgs; [ acl ];
21+
22+ meta = {
23+ description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them";
24+ license = lib.licenses.lgpl21Plus;
25+ };
26+}
pkgs/misc/drivers/sc-controller/default.nix−1
@@ -55,7 +55,6 @@ buildPythonApplication rec {
5555 meta = with lib; {
5656 homepage = "https://github.com/kozec/sc-controller";
5757 # donations: https://www.patreon.com/kozec
58− broken = true;
5958 description = "User-mode driver and GUI for Steam Controller and other controllers";
6059 license = licenses.gpl2;
6160 platforms = platforms.linux;
pkgs/top-level/python-packages.nix+8−2
@@ -5154,7 +5154,10 @@ in {
51545154
51555155 pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; };
51565156
5157− pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; };
5157+ pygobject3 = if isPy3k then
5158+ callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; }
5159+ else
5160+ callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkgconfig; };
51585161
51595162 pygogo = callPackage ../development/python-modules/pygogo { };
51605163
@@ -5242,7 +5245,10 @@ in {
52425245
52435246 pylev = callPackage ../development/python-modules/pylev { };
52445247
5245− pylibacl = callPackage ../development/python-modules/pylibacl { };
5248+ pylibacl = if isPy3k then
5249+ callPackage ../development/python-modules/pylibacl { }
5250+ else
5251+ callPackage ../development/python-modules/pylibacl/0.5.nix { };
52465252
52475253 pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { };
52485254