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: 298c3bdac0fc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59f94b12f3dc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 28, 2017

  1. qt59: fix qtCompatVersion 

    Qt 5.9 was incorrectly identified as being plugin-compatible with Qt 5.8.
    @ttuegel
    ttuegel committed Jun 28, 2017
    Copy the full SHA
    2ed4b6f View commit details

  2. dropbox: 28.4.14 -> 29.4.20

    @ttuegel
    ttuegel committed Jun 28, 2017
    Copy the full SHA
    59f94b1 View commit details
Showing with 12 additions and 6 deletions.
  1. +11 −5 pkgs/applications/networking/dropbox/default.nix
  2. +1 −1 pkgs/development/libraries/qt-5/5.9/default.nix
16 changes: 11 additions & 5 deletions pkgs/applications/networking/dropbox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,11 +24,11 @@
let
# NOTE: When updating, please also update in current stable,
# as older versions stop working
version = "28.4.14";
version = "29.4.20";
sha256 =
{
"x86_64-linux" = "02pfly33bg85c8y3igvkhyshra8ra089ghjibhzl1a4fmd45wf52";
"i686-linux" = "10swkjbzkyf19cilzw7ja6byla4dllr52pbz19wjzb8rv088gcla";
"x86_64-linux" = "0w8n8q846mqq8f3yisn9xazf323sn579zyp1kwrdrmmqalwiwcl2";
"i686-linux" = "0zgdnpizgkw2q6wglkdhpzzrhnpplfi2ldcw1z0k9r6slici5mfk";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");

arch =
@@ -40,14 +40,15 @@ let
# relative location where the dropbox libraries are stored
appdir = "opt/dropbox";

ldpath = stdenv.lib.makeLibraryPath
libs =
[
dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
ncurses zlib

qtbase qtdeclarative qtwebkit
];
ldpath = stdenv.lib.makeLibraryPath libs;

desktopItem = makeDesktopItem {
name = "dropbox";
@@ -70,9 +71,12 @@ in mkDerivation {
sourceRoot = ".dropbox-dist";

nativeBuildInputs = [ makeWrapper patchelf ];
buildInputs = libs;
dontStrip = true; # already done

installPhase = ''
runHook preInstall
mkdir -p "$out/${appdir}"
cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
@@ -102,9 +106,11 @@ in mkDerivation {
rm $out/${appdir}/wmctrl
ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl
runHook postInstall
'';

fixupPhase = ''
preFixup = ''
INTERP=$(cat $NIX_CC/nix-support/dynamic-linker)
RPATH="${ldpath}:$out/${appdir}"
getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/5.9/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ with stdenv.lib;

let

qtCompatVersion = "5.8";
qtCompatVersion = "5.9";

mirror = "http://download.qt.io";
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };