diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-08-29 09:41:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-29 09:41:29 +0100 |
commit | ff449e176a602f8440fcbb69c7f179ccfff5bcd0 (patch) | |
tree | 11c22d2635e1dcbf80806b7f7e86200288c73ce0 | |
parent | 4511e7031f7f3988382230bf7ef81246a1dd7f0c (diff) | |
parent | 4637166ead62c5a0e1c98173a055b53231c5c3bc (diff) | |
download | nixpkgs-ff449e176a602f8440fcbb69c7f179ccfff5bcd0.tar nixpkgs-ff449e176a602f8440fcbb69c7f179ccfff5bcd0.tar.gz nixpkgs-ff449e176a602f8440fcbb69c7f179ccfff5bcd0.tar.bz2 nixpkgs-ff449e176a602f8440fcbb69c7f179ccfff5bcd0.tar.lz nixpkgs-ff449e176a602f8440fcbb69c7f179ccfff5bcd0.tar.xz nixpkgs-ff449e176a602f8440fcbb69c7f179ccfff5bcd0.tar.zst nixpkgs-ff449e176a602f8440fcbb69c7f179ccfff5bcd0.zip |
Merge pull request #45668 from romildo/upd.python-efl
pythonefl: 1.20.0 -> 1.21.0
-rw-r--r-- | pkgs/development/python-modules/python-efl/default.nix | 37 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 30 |
2 files changed, 38 insertions, 29 deletions
diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix new file mode 100644 index 00000000000..8e3e9d9a584 --- /dev/null +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, python, enlightenment }: + +# Should be bumped along with EFL! + +buildPythonPackage rec { + name = "python-efl-${version}"; + version = "1.21.0"; + + src = fetchurl { + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; + sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ enlightenment.efl ]; + + propagatedBuildInputs = [ python.pkgs.dbus-python ]; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" + ''; + + preBuild = "${python.interpreter} setup.py build_ext"; + + installPhase= "${python.interpreter} setup.py install --prefix=$out"; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python bindings for EFL and Elementary"; + homepage = https://phab.enlightenment.org/w/projects/python_bindings_for_efl/; + platforms = platforms.linux; + license = with licenses; [ gpl3 lgpl3 ]; + maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ba335146ce..489f1730517 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15646,35 +15646,7 @@ EOF # added 2018-05-23, can be removed once 18.09 is branched off udiskie = throw "pythonPackages.udiskie has been replaced by udiskie"; - # Should be bumped along with EFL! - pythonefl = buildPythonPackage rec { - name = "python-efl-${version}"; - version = "1.20.0"; - src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "18qfqdkkjydqjk0nxs7wnnzdnqlbj3fhkjm0bbd927myzbihxpkh"; - }; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" - ''; - preBuild = "${python}/bin/${python.executable} setup.py build_ext"; - installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with self; [ pkgs.enlightenment.efl ]; - doCheck = false; - - meta = { - description = "Python bindings for EFL and Elementary"; - homepage = http://enlightenment.org/; - platforms = platforms.linux; - license = licenses.gpl3; - maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; - }; - }; + pythonefl = callPackage ../development/python-modules/python-efl { }; tlsh = buildPythonPackage rec { name = "tlsh-3.4.5"; |