diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2022-01-06 19:57:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-06 19:57:08 +0100 |
| commit | a523706d02434f38c36d2f20cfdd972074ce8e1e (patch) | |
| tree | 855ae0268157eabffc6329c4b1ef6ed10802b4ff /pkgs/development/libraries | |
| parent | 9be55be68e7ba7c91c740fca8c4331a0de4d3125 (diff) | |
| parent | 17c0bbb496667bb4f99fdd526245aaa2bb876a7f (diff) | |
Merge pull request #153744 from prusnak/qscintilla-cleanup
qscintilla: cleanup
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qscintilla-qt4/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/qscintilla/default.nix | 12 |
2 files changed, 18 insertions, 7 deletions
diff --git a/pkgs/development/libraries/qscintilla-qt4/default.nix b/pkgs/development/libraries/qscintilla-qt4/default.nix index 7cefdec97ca24..23daedd217e28 100644 --- a/pkgs/development/libraries/qscintilla-qt4/default.nix +++ b/pkgs/development/libraries/qscintilla-qt4/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchurl, unzip, qt4, qmake4Hook +{ stdenv +, lib +, fetchurl +, unzip +, qt4 +, qmake4Hook }: stdenv.mkDerivation rec { @@ -16,12 +21,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip qmake4Hook ]; - patches = ./fix-qt4-build.patch; + patches = [ + ./fix-qt4-build.patch + ]; # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser postFixup = '' - ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so + ln -s $out/lib/libqscintilla2_qt4.so $out/lib/libqscintilla2.so ''; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 3dcbc22e15fed..88c44ece32cd5 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,5 +1,9 @@ -{ stdenv, lib, fetchurl, unzip -, qtbase, qtmacextras +{ stdenv +, lib +, fetchurl +, unzip +, qtbase +, qtmacextras , qmake , fixDarwinDylibNames }: @@ -20,12 +24,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ]; nativeBuildInputs = [ unzip qmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser postFixup = '' - ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so + ln -s $out/lib/libqscintilla2_qt5.so $out/lib/libqscintilla2.so ''; dontWrapQtApps = true; |