From 07f8104707c7a2d078b00189ebeb3e9b73a42b32 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 13 Oct 2018 15:32:07 -0700
Subject: [PATCH] treewide: fix evaluation with `allowAliases = false`
---
pkgs/applications/networking/p2p/soulseekqt/default.nix | 4 ++--
pkgs/development/haskell-modules/configuration-nix.nix | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index 1b7901e3c46..104131e4775 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -5,7 +5,7 @@
, qtbase, qtmultimedia
, libjson, libgpgerror
, libX11, libxcb, libXau, libXdmcp, freetype, libbsd
-, pythonPackages, squashfsTools, desktop_file_utils
+, pythonPackages, squashfsTools, desktop-file-utils
}:
with stdenv.lib;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
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
unpackCmd = ''
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 523f4ed0212..e1fd8d13285 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -540,7 +540,7 @@ self: super: builtins.intersectAttrs super {
--prefix PATH : "${path}" \
--set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \
--set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \
- --set NIX_CFLAGS_LINK "-L${opencl-icd}/lib"
+ --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib"
'';
});
}