pyrox.dev / nixpkgs
lol
fork atom

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

mendeley: fix gconf errors, minor cleanup

authored by Orivej Desh and committed by GitHub 998859d7 8b697c8f

+17 -10
unified split
+16 -8
pkgs/applications/office/mendeley/default.nix
··· 15 , orc 16 , nss 17 , nspr 18 - , qt5 19 , sqlite 20 , xorg 21 , xlibs ··· 47 else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap"; 48 49 deps = [ 50 - qt5.qtbase 51 - qt5.qtsvg 52 - qt5.qtdeclarative 53 - qt5.qtwebchannel 54 - qt5.qtquickcontrols 55 - qt5.qtwebkit 56 - qt5.qtwebengine 57 alsaLib 58 dbus 59 freetype ··· 95 96 nativeBuildInputs = [ makeWrapper ]; 97 buildInputs = [ dpkg which ] ++ deps; 98 99 unpackPhase = "true"; 100
··· 15 , orc 16 , nss 17 , nspr 18 + , qtbase 19 + , qtsvg 20 + , qtdeclarative 21 + , qtwebchannel 22 + , qtquickcontrols 23 + , qtwebkit 24 + , qtwebengine 25 , sqlite 26 , xorg 27 , xlibs ··· 53 else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap"; 54 55 deps = [ 56 + qtbase 57 + qtsvg 58 + qtdeclarative 59 + qtwebchannel 60 + qtquickcontrols 61 + qtwebkit 62 + qtwebengine 63 alsaLib 64 dbus 65 freetype ··· 101 102 nativeBuildInputs = [ makeWrapper ]; 103 buildInputs = [ dpkg which ] ++ deps; 104 + 105 + propagatedUserEnvPkgs = [ gconf ]; 106 107 unpackPhase = "true"; 108
+1 -2
pkgs/top-level/all-packages.nix
··· 15903 15904 mcomix = callPackage ../applications/graphics/mcomix { }; 15905 15906 - mendeley = callPackage ../applications/office/mendeley { 15907 - qt5 = qt56; 15908 gconf = pkgs.gnome2.GConf; 15909 }; 15910
··· 15903 15904 mcomix = callPackage ../applications/graphics/mcomix { }; 15905 15906 + mendeley = libsForQt56.callPackage ../applications/office/mendeley { 15907 gconf = pkgs.gnome2.GConf; 15908 }; 15909