diff options
Diffstat (limited to 'pkgs/development/tools/misc/saleae-logic/default.nix')
| -rw-r--r-- | pkgs/development/tools/misc/saleae-logic/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 53020671d17e5..cd027c7b08d71 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -8,15 +8,15 @@ { stdenv, fetchurl, unzip, glib, libSM, libICE, gtk, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor -, freetype, libXinerama -, makeDesktopItem +, freetype, libXinerama, libxcb, zlib, pciutils +, makeDesktopItem, xkeyboardconfig }: let libPath = stdenv.lib.makeLibraryPath [ glib libSM libICE gtk libXext libXft fontconfig libXrender libXfixes libX11 - libXi libXrandr libXcursor freetype libXinerama + libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib ]; in @@ -25,21 +25,21 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { pname = "saleae-logic"; - version = "1.1.15"; + version = "1.2.9"; name = "${pname}-${version}"; src = if stdenv.system == "i686-linux" then fetchurl { - name = "saleae-logic-${version}-32bit.zip"; - url = "http://downloads.saleae.com/Logic%20${version}%20(32-bit).zip"; - sha256 = "0h13my4xgv8v8l12shimhhn54nn0dldbxz1gpbx92ysd8q8x1q79"; + name = "saleae-logic-${version}-32bit.zip"; + url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(32-bit).zip"; + sha256 = "0000004xgv8v8l12shimhhn54nn0dldbxz1gpbx92ysd8q8x1q79"; } else if stdenv.system == "x86_64-linux" then fetchurl { - name = "saleae-logic-${version}-64bit.zip"; - url = "http://downloads.saleae.com/Logic%20${version}%20(64-bit).zip"; - sha256 = "1phnjsmaj1gflx7shh8wfrd8dnhn43s3v7bck41h8yj4nd4ax69z"; + name = "saleae-logic-${version}-64bit.zip"; + url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; + sha256 = "1d4hmp756ysfk5i1ys4mlkd1czbdw0zqznkzx08pyqk93zc7b16s"; } else abort "Saleae Logic software requires i686-linux or x86_64-linux"; @@ -74,6 +74,8 @@ stdenv.mkDerivation rec { cat > "$out/bin/saleae-logic" << EOF #!${stdenv.shell} export LD_PRELOAD="$out/lib/preload.so" + export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" + export PATH="${pciutils}/bin:\$PATH" exec "$out/Logic" "\$@" EOF chmod a+x "$out"/bin/saleae-logic |