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

Merge pull request #61001 from ryan4729/qscintilla-macos

Browse Source 
qscintilla: add qtmacextras to propagatedBuildInputs on darwin
This commit is contained in:
Renaud 2019-05-12 00:13:57 +02:00 committed by GitHub
commit c162ccf1c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/qscintilla/default.nix
View File

@ -20,8 +20,10 @@ stdenv.mkDerivation rec {
sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi";
};
buildInputs = [ (if withQt5 then qtbase else qt4) ]
++ lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
buildInputs = [ (if withQt5 then qtbase else qt4) ];
propagatedBuildInputs = lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
nativeBuildInputs = [ unzip ]
++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;