Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4aaf2ad527e1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f3a97b24cd33
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 27, 2019

  1. qt5ct: qtsvg, qmakeFlags nixification

    @dtzWill @jokogr
    dtzWill authored and jokogr committed Oct 27, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    81fed28 View commit details

  2. Merge pull request #72095 from jokogr/f/qt5ct-qmakeflags 

    qt5ct: qtsvg, qmakeFlags nixification
    @veprbl
    veprbl authored Oct 27, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f3a97b2 View commit details
Showing with 3 additions and 6 deletions.
  1. +3 −6 pkgs/tools/misc/qt5ct/default.nix
9 changes: 3 additions & 6 deletions pkgs/tools/misc/qt5ct/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, qtbase, qttools, qmake }:
{ mkDerivation, lib, fetchurl, qtbase, qtsvg, qttools, qmake }:

let inherit (lib) getDev; in

@@ -13,16 +13,13 @@ mkDerivation rec {

nativeBuildInputs = [ qmake qttools ];

buildInputs = [ qtbase ];
buildInputs = [ qtbase qtsvg ];

qmakeFlags = [
"LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease"
"PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
];

preConfigure = ''
qmakeFlags+=" PLUGINDIR=$out/$qtPluginPrefix"
'';

enableParallelBuilding = true;

meta = with lib; {