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

Commits on Jan 16, 2018

  1. plasma-vault: Fixes build

    @bkchr
    bkchr committed Jan 16, 2018
    Copy the full SHA
    f8630c9 View commit details

  2. Merge pull request #33935 from bkchr/fix_plasma_vault 

    plasma-vault: Fixes build
    @adisbladis
    adisbladis authored Jan 16, 2018
    Copy the full SHA
    0239333 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/desktops/plasma-5/plasma-vault/default.nix
10 changes: 5 additions & 5 deletions pkgs/desktops/plasma-5/plasma-vault/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,13 +26,13 @@ mkDerivation {
kactivities plasma-framework kwindowsystem libksysguard
];

NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_ENCFS="${lib.getBin encfs}/bin/encfs"''
''-DNIXPKGS_ENCFSCTL="${lib.getBin encfs}/bin/encfsctl"''
CXXFLAGS = [
''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"''
''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"''

''-DNIXPKGS_CRYFS="${lib.getBin cryfs}/bin/cryfs"''
''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"''

''-DNIXPKGS_FUSERMOUNT="${lib.getBin fuse}/bin/fusermount"''
''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"''
];

}