Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 49859351eac7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d082988a6261
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 2, 2020

  1. scallion: use openssl 1.0 

    it does not work with openssl 1.1 (upstream issue lachesis/scallion#113)
    volth authored Apr 2, 2020
    Copy the full SHA
    8195e7e View commit details

  2. Merge pull request #84108 from volth/patch-395 

    scallion: use openssl 1.0
    @Mic92
    Mic92 authored Apr 2, 2020
    Copy the full SHA
    d082988 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/tools/security/scallion/default.nix
4 changes: 2 additions & 2 deletions pkgs/tools/security/scallion/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, mono, openssl, ocl-icd }:
{ stdenv, fetchFromGitHub, makeWrapper, mono, openssl_1_0_2, ocl-icd }:

stdenv.mkDerivation rec {
version = "2.1";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/share
cp scallion/bin/Debug/* $out/share/
makeWrapper ${mono}/bin/mono $out/bin/scallion \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ocl-icd ]} \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \
--add-flags $out/share/scallion.exe
'';