diff options
Diffstat (limited to 'pkgs/by-name')
| -rw-r--r-- | pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 22 | ||||
| -rw-r--r-- | pkgs/by-name/tc/tcsh/package.nix | 2 |
2 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index 9dbd32c31b3f..fca1924b087a 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -2,29 +2,16 @@ , lib , alsa-lib , autoPatchelfHook -, buildFHSEnv -, ciscoPacketTracer8 , copyDesktopItems , dbus , dpkg , expat , fontconfig , glib -, libdrm -, libglvnd -, libpulseaudio -, libudev0-shim -, libxkbcommon -, libxml2 -, libxslt -, lndir , makeDesktopItem , makeWrapper -, nspr -, nss , qt5 , requireFile -, xorg }: let @@ -40,14 +27,14 @@ let }; in -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (args: { pname = "ciscoPacketTracer8"; version = "8.2.2"; src = requireFile { - name = names.${version}; - hash = hashes.${version}; + name = names.${args.version}; + hash = hashes.${args.version}; url = "https://www.netacad.com"; }; @@ -88,6 +75,7 @@ stdenvNoCC.mkDerivation rec { makeWrapper "$out/opt/pt/bin/PacketTracer" "$out/bin/packettracer8" \ "''${qtWrapperArgs[@]}" \ + --set QT_QPA_PLATFORMTHEME "" \ --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin" install -D $out/opt/pt/art/app.png $out/share/icons/hicolor/128x128/apps/ciscoPacketTracer8.png @@ -122,4 +110,4 @@ stdenvNoCC.mkDerivation rec { platforms = [ "x86_64-linux" ]; mainProgram = "packettracer8"; }; -} +}) diff --git a/pkgs/by-name/tc/tcsh/package.nix b/pkgs/by-name/tc/tcsh/package.nix index abc58430f2e6..f254fed78080 100644 --- a/pkgs/by-name/tc/tcsh/package.nix +++ b/pkgs/by-name/tc/tcsh/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { - job control ''; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres suominen ]; platforms = lib.platforms.unix; }; }) |