diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/fdtools/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/fdtools/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/tools/misc/fdtools/default.nix b/nixpkgs/pkgs/tools/misc/fdtools/default.nix index e9efd66b2f1f..f55c7f6d3b39 100644 --- a/nixpkgs/pkgs/tools/misc/fdtools/default.nix +++ b/nixpkgs/pkgs/tools/misc/fdtools/default.nix @@ -2,8 +2,10 @@ let pname = "fdtools"; + # When you update, check whether we can drop the skalibs pin. version = "2020.05.04"; sha256 = "0lnafcp4yipi0dl8gh33zjs8wlpz0mim8mwmiz9s49id0b0fmlla"; + skalibs = skawarePackages.skalibs_2_10; in stdenv.mkDerivation { inherit pname version; @@ -16,7 +18,10 @@ in stdenv.mkDerivation { patches = [ ./new-skalibs.patch ]; outputs = [ "bin" "lib" "dev" "doc" "out" ]; - buildInputs = [ skawarePackages.skalibs ]; + buildInputs = [ + # temporary, until fdtools catches up to skalibs + skalibs + ]; configurePhase = '' cd ${pname}-${version} @@ -27,7 +32,7 @@ in stdenv.mkDerivation { conf-compile/defaults/host_compile.sh \ > conf-compile/host_compile.sh - echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" \ + echo "${skalibs.lib}/lib/skalibs/sysdeps" \ > conf-compile/depend_skalibs_sysdeps ''; |