diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
| commit | 55abc327b49b4097e48c916e40803caa8cf46e8f (patch) | |
| tree | 1c0420ab3fb21d9485460b912f1c3eae18781871 /nixpkgs/pkgs/development/libraries/qscintilla | |
| parent | 7936cf821dccc1eaade44b852db09d03fae8e5f3 (diff) | |
| parent | 18324978d632ffc55ef1d928e81630c620f4f447 (diff) | |
| download | nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.gz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.bz2 nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.lz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.xz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.zst nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qscintilla')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qscintilla/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qscintilla/default.nix b/nixpkgs/pkgs/development/libraries/qscintilla/default.nix index 4aff530877a0..5a2b00c54e3e 100644 --- a/nixpkgs/pkgs/development/libraries/qscintilla/default.nix +++ b/nixpkgs/pkgs/development/libraries/qscintilla/default.nix @@ -3,7 +3,7 @@ , fetchurl , unzip , qtbase -, qtmacextras +, qtmacextras ? null , qmake , fixDarwinDylibNames }: @@ -63,5 +63,7 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3 ]; # and commercial maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + # ld: library not found for -lcups + broken = stdenv.isDarwin && lib.versionAtLeast qtbase.version "6"; }; } |