cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

qscintilla: cleanup of derivations

Browse source
This commit is contained in:
Will Cohen 2022-01-06 08:30:39 -05:00
parent 8dfa516824
commit b8504e9b84
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/qscintilla/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase ];
propagatedBuildInputs = lib.optional stdenv.isDarwin qtmacextras;
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ];
nativeBuildInputs = [ unzip qmake ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/python-modules/qscintilla-qt5/default.nix
View file

@ -3,7 +3,7 @@
, qscintilla
, qtbase
, qmake
, qtmacextras ? null
, qtmacextras
, stdenv
}:
@ -19,7 +19,7 @@ in buildPythonPackage rec {
nativeBuildInputs = [ sip qmake pyqt-builder qscintilla ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ pyqt5 ] ++ lib.optional (stdenv.isDarwin) qtmacextras;
propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ];
dontWrapQtApps = true;

6
pkgs/top-level/all-packages.nix
View file

@ -19494,17 +19494,17 @@ with pkgs;
});
libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix {
inherit lib pkgs stdenv;
inherit lib pkgs;
qt5 = qt512;
});
libsForQt514 = recurseIntoAttrs (import ./qt5-packages.nix {
inherit lib pkgs stdenv;
inherit lib pkgs;
qt5 = qt514;
});
libsForQt515 = recurseIntoAttrs (import ./qt5-packages.nix {
inherit lib pkgs stdenv;
inherit lib pkgs;
qt5 = qt515;
});