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: f21b846afee6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6158c508cf56
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 21, 2019

  1. volume_key: cross compilation fixes

    @illegalprime
    illegalprime committed Mar 21, 2019
    Copy the full SHA
    30dd92f View commit details

Commits on Jun 1, 2019

  1. Merge pull request #58054 from illegalprime/volume_key-cross 

    volume_key: cross compilation fixes
    @matthewbauer
    matthewbauer authored Jun 1, 2019
    Copy the full SHA
    6158c50 View commit details
Showing with 14 additions and 2 deletions.
  1. +14 −2 pkgs/development/libraries/volume-key/default.nix
16 changes: 14 additions & 2 deletions pkgs/development/libraries/volume-key/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3
, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme
, autoconf, automake, libtool
, writeShellScriptBin
, buildPackages
}:

let
@@ -15,9 +18,18 @@ in stdenv.mkDerivation rec {

outputs = [ "out" "man" "dev" "py" ];

nativeBuildInputs = [ autoreconfHook pkgconfig gettext python3 ncurses swig ];
nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext swig ];

buildInputs = [ glib cryptsetup nss utillinux gpgme ];
buildInputs = [ autoreconfHook glib cryptsetup nss utillinux gpgme ncurses ];

configureFlags = [
"--with-gpgme-prefix=${gpgme.dev}"
];

preConfigure = ''
export PYTHON="${buildPackages.python3}/bin/python"
export PYTHON3_CONFIG="${python3}/bin/python3-config"
'';

makeFlags = [
"pyexecdir=$(py)/${python3.sitePackages}"