diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
| commit | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (patch) | |
| tree | c3b5c34b1c533f5c231dc6707e96795fb3a9a138 /nixpkgs/pkgs/development/libraries/protobuf | |
| parent | 44e04ea2730f8e3b863b81b0056babe233c244f6 (diff) | |
| parent | 1036dc664169b32613ec11b58cc1740c7511a340 (diff) | |
| download | nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.gz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.bz2 nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.lz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.xz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.zst nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.zip | |
Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/protobuf')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/protobuf/3.4.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/protobuf/3.5.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix | 4 |
3 files changed, 0 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.4.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.4.nix deleted file mode 100644 index 5a9034a56a80..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.4.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, lib, ... }: - -lib.overrideDerivation (callPackage ./generic-v3.nix { - version = "3.4.1"; - sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb"; -}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.5.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.5.nix deleted file mode 100644 index db9cb6f0371b..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.5.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, lib, ... }: - -lib.overrideDerivation (callPackage ./generic-v3.nix { - version = "3.5.1.1"; - sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; -}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix index 610efcfef298..a98521a2d1ee 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix @@ -40,10 +40,6 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { dontDisableStatic = true; - NIX_CFLAGS_COMPILE = with stdenv.lib; - # gcc before 6 doesn't know this option - optionalString (hasPrefix "gcc-6" stdenv.cc.cc.name) "-Wno-error=misleading-indentation"; - meta = { description = "Google's data interchange format"; longDescription = |