JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33436 from dtzWill/fix/mendeley-gconf

Browse Source 
mendeley: fix gconf errors, minor cleanup
This commit is contained in:
Orivej Desh 2018-01-06 03:46:19 +00:00 committed by GitHub
commit 998859d7a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/office/mendeley/default.nix
View File

@ -15,7 +15,13 @@
, orc , orc
, nss , nss
, nspr , nspr
, qt5 , qtbase
, qtsvg
, qtdeclarative
, qtwebchannel
, qtquickcontrols
, qtwebkit
, qtwebengine
, sqlite , sqlite
, xorg , xorg
, xlibs , xlibs
@ -47,13 +53,13 @@ let
else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap"; else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap";
deps = [ deps = [
qt5.qtbase qtbase
qt5.qtsvg qtsvg
qt5.qtdeclarative qtdeclarative
qt5.qtwebchannel qtwebchannel
qt5.qtquickcontrols qtquickcontrols
qt5.qtwebkit qtwebkit
qt5.qtwebengine qtwebengine
alsaLib alsaLib
dbus dbus
freetype freetype
@ -96,6 +102,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ dpkg which ] ++ deps; buildInputs = [ dpkg which ] ++ deps;
propagatedUserEnvPkgs = [ gconf ];
unpackPhase = "true"; unpackPhase = "true";
installPhase = '' installPhase = ''

3
pkgs/top-level/all-packages.nix
View File

@ -15903,8 +15903,7 @@ with pkgs;
mcomix = callPackage ../applications/graphics/mcomix { }; mcomix = callPackage ../applications/graphics/mcomix { };
mendeley = callPackage ../applications/office/mendeley { mendeley = libsForQt56.callPackage ../applications/office/mendeley {
qt5 = qt56;
gconf = pkgs.gnome2.GConf; gconf = pkgs.gnome2.GConf;
}; };