JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: fix evaluation with allowAliases = false

Browse Source
This commit is contained in:
Ryan Mulligan 2018-10-13 15:32:07 -07:00
parent 0c97d25092
commit 07f8104707
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/p2p/soulseekqt/default.nix
View File

@ -5,7 +5,7 @@
, qtbase, qtmultimedia , qtbase, qtmultimedia
, libjson, libgpgerror , libjson, libgpgerror
, libX11, libxcb, libXau, libXdmcp, freetype, libbsd , libX11, libxcb, libXau, libXdmcp, freetype, libbsd
, pythonPackages, squashfsTools, desktop_file_utils , pythonPackages, squashfsTools, desktop-file-utils
}: }:
with stdenv.lib; with stdenv.lib;
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
dontBuild = true; dontBuild = true;
buildInputs = [ pythonPackages.binwalk squashfsTools desktop_file_utils ]; buildInputs = [ pythonPackages.binwalk squashfsTools desktop-file-utils ];
# avoid usage of appimage's runner option --appimage-extract # avoid usage of appimage's runner option --appimage-extract
unpackCmd = '' unpackCmd = ''

2
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -540,7 +540,7 @@ self: super: builtins.intersectAttrs super {
--prefix PATH : "${path}" \ --prefix PATH : "${path}" \
--set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \
--set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \
--set NIX_CFLAGS_LINK "-L${opencl-icd}/lib" --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib"
''; '';
}); });
} }