diff options
author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
---|---|---|
committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/applications/backup | |
parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) |
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
Diffstat (limited to 'pkgs/applications/backup')
-rw-r--r-- | pkgs/applications/backup/crashplan/crashplan-small-business.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix index 9bed504103a1..529b0dbd42b6 100644 --- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix +++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, - procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, - fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, libudev, - libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, +{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, + procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, + fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev, + libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages, maxRam ? "1024m" }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = "1512021600670_4503"; pname = "CrashPlanSmb"; name = "${pname}_${version}_${rev}"; - + src = fetchurl { url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz"; sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { vardir = "/var/lib/crashplan"; manifestdir = "${vardir}/manifest"; - + postPatch = '' # patch scripts/CrashPlanEngine substituteInPlace scripts/CrashPlanEngine \ @@ -85,10 +85,10 @@ stdenv.mkDerivation rec { postFixup = '' patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan - wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ - stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype - fontconfig dbus gconf nss nspr alsaLib cups expat libudev - libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite + wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype + fontconfig dbus gconf nss nspr alsaLib cups expat udev + libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libXtst libXScrnSaver]}" ''; |