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: ea8686e253aa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 700dcaf30f6e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 22, 2019

  1. deepin.qt5dxcb-plugin: fix qtbase version

    @romildo
    romildo committed Oct 22, 2019
    Copy the full SHA
    32e0398 View commit details

  2. Merge pull request #71667 from romildo/fix.qt5dxcb-plugin 

    deepin.qt5dxcb-plugin: fix qtbase version
    @worldofpeace
    worldofpeace authored Oct 22, 2019
    Copy the full SHA
    700dcaf View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
2 changes: 1 addition & 1 deletion pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ mkDerivation rec {
# The Qt5 platforms plugin is vendored in the package, however what's there is not always up-to-date with what's in nixpkgs.
# We simply copy the headers from qtbase's source tarball.
mkdir -p platformplugin/libqt5xcbqpa-dev/${qtbase.version}
cp -r ../qtbase-everywhere-src-5.12.4/src/plugins/platforms/xcb/*.h platformplugin/libqt5xcbqpa-dev/${qtbase.version}/
cp -r ../qtbase-everywhere-src-${qtbase.version}/src/plugins/platforms/xcb/*.h platformplugin/libqt5xcbqpa-dev/${qtbase.version}/
'';

qmakeFlags = [