public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-08-31 09:50:38 +02:00
parent 98640fd482 81760f3235
commit fc74ba8291
364 changed files with 8989 additions and 6877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/python-modules/pykde4/default.nix
View File

@@ -1,8 +1,10 @@
{ pyqt4,
stdenv, callPackage, fetchurl, cmake, automoc4, sip }:
{ pyqt4, openssl_1_0_2
, stdenv, callPackage, fetchurl, cmake, automoc4, sip }:
let
kdelibs = callPackage ./kdelibs.nix {};
kdelibs = callPackage ./kdelibs.nix {
openssl = openssl_1_0_2;
};
sip4_19_3 = sip.overrideAttrs (oldAttrs: rec {
src = fetchurl {
url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz";

4
pkgs/development/python-modules/pykde4/kdelibs.nix
View File

@@ -2,7 +2,7 @@
stdenv, fetchurl,
automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info,
attica, docbook_xml_dtd_42, docbook_xsl, giflib,
libdbusmenu_qt, libjpeg, phonon, qt4
libdbusmenu_qt, libjpeg, phonon, qt4, openssl
}:
stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info
];
buildInputs = [
attica giflib libdbusmenu_qt libjpeg
attica giflib libdbusmenu_qt libjpeg openssl
];
propagatedBuildInputs = [ qt4 phonon ];