summary refs log tree commit diff
path: root/pkgs/os-specific/windows/mingw-w64/headers.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-08-12 10:33:41 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-08-12 10:33:41 +0200
commit00df25ee57fcc2227ffdbbff2280b13d898bfd7d (patch)
treea2cdc854489799c6d7900b0e5ac215b7b95d762a /pkgs/os-specific/windows/mingw-w64/headers.nix
parent580cab57e4f188d25144e398d7b8e3d5085299a9 (diff)
parentbb3f7d14a17e88e4341872c55d8b32127c6f8101 (diff)
downloadnixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar
nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.gz
nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.bz2
nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.lz
nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.xz
nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.zst
nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.zip
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
Diffstat (limited to 'pkgs/os-specific/windows/mingw-w64/headers.nix')
-rw-r--r--pkgs/os-specific/windows/mingw-w64/headers.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix
index 03dbf712e2e..6a93cea6708 100644
--- a/pkgs/os-specific/windows/mingw-w64/headers.nix
+++ b/pkgs/os-specific/windows/mingw-w64/headers.nix
@@ -1,13 +1,13 @@
-{ stdenvNoCC, callPackage }:
+{ stdenvNoCC, mingw_w64 }:
 
-let
-  inherit (callPackage ./common.nix {}) name src;
+stdenvNoCC.mkDerivation {
+  name = "${mingw_w64.name}-headers";
+  inherit (mingw_w64) src meta;
 
-in stdenvNoCC.mkDerivation {
-  name = name + "-headers";
-  inherit src;
+  patches = [ ./osvi.patch ];
 
   preConfigure = ''
     cd mingw-w64-headers
   '';
+
 }